From 4ff73dce28fbe1dfde91f62ae26a8e75bdf03d58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Thu, 30 Jul 2015 09:33:54 +0000
Subject: [PATCH] fixed qt detection

---
 ax_check_qt.m4              | 10 +++++-----
 ax_init_standard_project.m4 |  2 +-
 bootstrap.sh                |  8 +++++++-
 libpcscxx.spec.in           |  3 +--
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/ax_check_qt.m4 b/ax_check_qt.m4
index 211513a..39da720 100644
--- a/ax_check_qt.m4
+++ b/ax_check_qt.m4
@@ -1,16 +1,16 @@
 # SYNOPSIS
 #
 #   Check if a module exists:
-#     AX_CXX_CHECK_QT([qt_prefix], [list-of-qt-modules], [optional-modules])
+#     AX_CHECK_QT([qt_prefix], [list-of-qt-modules], [optional-modules])
 #
 #   Abort if a module does not exist:
-#     AX_CXX_REQUIRE_QT([qt_prefix], [list-of-qt-modules], [optional-modules])
+#     AX_REQUIRE_QT([qt_prefix], [list-of-qt-modules], [optional-modules])
 #
 # DESCRIPTIONS
 #
 #    qt_prefix
 #
-#      Each call to AX_CXX_CHECK_QT should have a different prefix
+#      Each call to AX_CHECK_QT should have a different prefix
 #      value (with a few exceptions discussed later on). This value,
 #      usually provided in uppercase, is used as prefix to the
 #      variables holding the compiler flags and libraries reported by
@@ -179,13 +179,13 @@ qrc_%.cxx: %.qrc
 
 # SYNOPSIS
 #
-#   AX_CXX_CHECK_QT([qt_prefix], [list-of-qt-modules], [optional-modules])
+#   AX_CHECK_QT([qt_prefix], [list-of-qt-modules], [optional-modules])
 #
 # DESCRIPTIONS
 #
 #    qt_prefix
 #
-#      Each call to AX_CXX_CHECK_QT should have a different prefix
+#      Each call to AX_CHECK_QT should have a different prefix
 #      value (with a few exceptions discussed later on). This value,
 #      usually provided in uppercase, is used as prefix to the
 #      variables holding the compiler flags and libraries reported by
diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index 03988e1..c94918f 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -85,7 +85,7 @@ AC_DEFUN([AX_ADD_MAKEFILE_TARGET_DEP], [
 #     $1 = variable name
 AC_DEFUN([AX_SUBST], [
   AC_SUBST([$1])
-  tmp_var=$(echo "${$1}" | awk 1 ORS='\\n')
+  tmp_var=$(echo "${$1}" | awk 1 ORS='\\n' | sed 's,\\n$,,')
   tmp_var=${tmp_var//\"/\\\"}
   tmp_var=${tmp_var//\'/\'\"\'\"\'}
   tmp_var=${tmp_var//#/\\#}
diff --git a/bootstrap.sh b/bootstrap.sh
index 85b6b7b..68a5a27 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -732,7 +732,13 @@ else
   echo Applications/...;
 fi)
 Source0: %{name}-%{version}.tar.gz
-BuildRequires: gnupg, subversion, automake, autoconf $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz"; fi; if testtag AX_CXX_QT || testtag AX_CXX_CHECK_QT; then echo -n ", qtbase5-devel | libqt4-devel, qtbase5-devel-tools | qt4-devel-tools"; fi)
+BuildRequires: gnupg, subversion, automake, autoconf$(
+    if testtag AX_USE_DOXYGEN; then
+      echo -n ", doxygen, graphviz";
+    fi;
+    if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then
+      echo -n ", qtbase5-devel | libqt4-devel, qtbase5-devel-tools | qt4-devel-tools";
+    fi)
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 %if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version}
 BuildRequires: pkgconfig, redhat-lsb$(if testtag AX_USE_CPPUNIT; then echo -n ", cppunit-devel"; fi)
diff --git a/libpcscxx.spec.in b/libpcscxx.spec.in
index 13db902..1e6006d 100644
--- a/libpcscxx.spec.in
+++ b/libpcscxx.spec.in
@@ -5,7 +5,7 @@ Release: @BUILD_NUMBER@%{?dist}
 License: LGPL
 Group: Development/Libraries/C++
 Source0: %{name}-%{version}.tar.gz
-BuildRequires: gnupg, subversion, automake, autoconf , doxygen, graphviz
+BuildRequires: gnupg, subversion, automake, autoconf, doxygen, graphviz, qtbase5-devel | libqt4-devel, qtbase5-devel-tools | qt4-devel-tools
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 %if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version}
 BuildRequires: pkgconfig, redhat-lsb
@@ -39,7 +39,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-/usr/bin
 /usr/%_lib/@PACKAGE_NAME@.so.*
 %doc
 /usr/share/doc/packages/@PACKAGE_NAME@/AUTHORS