[aqbanking] - q4banking: try harder to purge qt3 dep (#626008)

[Rex Dieter]

commit b9e9258bb265200aeb37db04f894ee3e124331f9
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Aug 22 10:58:26 2010 -0500

    - q4banking: try harder to purge qt3 dep (#626008)

 aqbanking-4.2.4-aqofxconnect_qt4.patch     |   24 ------------------
 aqbanking-4.2.4-q4banking_remove_qt3.patch |   37 ++++++++++++++++++++++++++++
 aqbanking.spec                             |   21 +++++++++-------
 3 files changed, 49 insertions(+), 33 deletions(-)
---
diff --git a/aqbanking-4.2.4-q4banking_remove_qt3.patch b/aqbanking-4.2.4-q4banking_remove_qt3.patch
new file mode 100644
index 0000000..a2b8029
--- /dev/null
+++ b/aqbanking-4.2.4-q4banking_remove_qt3.patch
@@ -0,0 +1,37 @@
+diff -up aqbanking-4.2.4/src/plugins/backends/aqhbci/ui/qt4/qt4_debug/Makefile.am.aqofxconnect_qt4 aqbanking-4.2.4/src/plugins/backends/aqhbci/ui/qt4/qt4_debug/Makefile.am
+diff -up aqbanking-4.2.4/src/plugins/backends/aqhbci/ui/qt4/qt4_debug/Makefile.in.aqofxconnect_qt4 aqbanking-4.2.4/src/plugins/backends/aqhbci/ui/qt4/qt4_debug/Makefile.in
+--- aqbanking-4.2.4/src/plugins/backends/aqhbci/ui/qt4/qt4_debug/Makefile.in.aqofxconnect_qt4	2010-02-06 09:31:25.000000000 -0600
++++ aqbanking-4.2.4/src/plugins/backends/aqhbci/ui/qt4/qt4_debug/Makefile.in	2010-08-22 10:20:00.934381140 -0500
+@@ -409,7 +409,7 @@ aqhbci_qt4_debug_LDADD = \
+   $(aqbanking_internal_libs) \
+   $(q4banking_internal_libs) \
+   $(aqhbci_internal_libs) \
+-  $(gwenhywfar_libs) $(qt3_libs) -lQtCore
++  $(gwenhywfar_libs) $(qt4_libs) -lQtCore
+ 
+ CLEANFILES = qt4_debug.xml
+ all: all-am
+diff -up aqbanking-4.2.4/src/plugins/backends/aqofxconnect/ui/qt4/libs/Makefile.am.aqofxconnect_qt4 aqbanking-4.2.4/src/plugins/backends/aqofxconnect/ui/qt4/libs/Makefile.am
+--- aqbanking-4.2.4/src/plugins/backends/aqofxconnect/ui/qt4/libs/Makefile.am.aqofxconnect_qt4	2010-01-15 17:07:28.000000000 -0600
++++ aqbanking-4.2.4/src/plugins/backends/aqofxconnect/ui/qt4/libs/Makefile.am	2010-08-22 10:11:57.803629775 -0500
+@@ -33,7 +33,7 @@ aqofxconnect_la_LIBADD=\
+   $(aqofxconnect_internal_libs) \
+   $(aqbanking_internal_libs) \
+   $(q4banking_internal_libs) \
+-  $(gwenhywfar_libs) $(qt3_libs)
++  $(gwenhywfar_libs) $(qt4_libs)
+ 
+ MOC_FILES=\
+  cfgtabpageaccountofx.moc \
+diff -up aqbanking-4.2.4/src/plugins/backends/aqofxconnect/ui/qt4/libs/Makefile.in.aqofxconnect_qt4 aqbanking-4.2.4/src/plugins/backends/aqofxconnect/ui/qt4/libs/Makefile.in
+--- aqbanking-4.2.4/src/plugins/backends/aqofxconnect/ui/qt4/libs/Makefile.in.aqofxconnect_qt4	2010-02-06 09:31:26.000000000 -0600
++++ aqbanking-4.2.4/src/plugins/backends/aqofxconnect/ui/qt4/libs/Makefile.in	2010-08-22 10:11:57.804649959 -0500
+@@ -425,7 +425,7 @@ aqofxconnect_la_LIBADD = \
+   $(aqofxconnect_internal_libs) \
+   $(aqbanking_internal_libs) \
+   $(q4banking_internal_libs) \
+-  $(gwenhywfar_libs) $(qt3_libs)
++  $(gwenhywfar_libs) $(qt4_libs)
+ 
+ MOC_FILES = \
+  cfgtabpageaccountofx.moc \
diff --git a/aqbanking.spec b/aqbanking.spec
index 7e5be56..9d90304 100644
--- a/aqbanking.spec
+++ b/aqbanking.spec
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define qt3pkg qt
+%define qt3 qt
 %if 0%{?fedora} > 8 || 0%{?rhel} > 5
-%define qt3pkg qt3
+%define qt3 qt3
 %endif
 
 Name: aqbanking
 Summary: A library for online banking functions and financial data import/export
 Version: 4.2.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 # Download is PHP form at http://www.aquamaniac.de/sites/download/packages.php
 Source: %{name}-%{version}.tar.gz
 Group: System Environment/Libraries
@@ -16,11 +16,11 @@ License: GPLv2+
 URL: http://www.aquamaniac.de/aqbanking/
 Patch2: aqbanking-4.2.4-pkgconfig.patch
 Patch3: aqbanking-2.1.0-conflict.patch
-# upstreamable, omit inadvertant(?) qt3 linkage in qt4 version of aqofxconnect -- Rex
-Patch4: aqbanking-4.2.4-aqofxconnect_qt4.patch
+# upstreamable, omit inadvertant(?) qt3 linkage q4banking -- Rex
+Patch4: aqbanking-4.2.4-q4banking_remove_qt3.patch 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # qbanking
-BuildRequires: %{qt3pkg}-devel
+BuildRequires: %{qt3}-devel
 BuildRequires: qt4-devel
 BuildRequires: gwenhywfar-devel >= 3.10.0, gmp-devel, gettext, libtool
 Obsoletes: aqhbci <= 1.0.3
@@ -68,7 +68,7 @@ Summary: Development headers for qbanking
 Group: Development/Libraries
 Requires: %{name}-devel = %{version}-%{release}
 Requires: qbanking = %{version}-%{release}
-Requires: %{qt3pkg}-devel
+Requires: %{qt3}-devel
 Obsoletes: kbanking-devel < 3.7.2-1 
 
 %description -n qbanking-devel
@@ -79,7 +79,7 @@ compiling programs using the qbanking bindings for Aqbanking.
 Summary: Qt4 bindings for Aqbanking
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-%{?_qt4_version:Requires:qt4 >= %{_qt4_version}}
+%{?_qt4_version:Requires:qt4%{?_isa} >= %{_qt4_version}}
 %description -n q4banking
 %{summary}.
 
@@ -97,7 +97,7 @@ Requires: qt4-devel
 %setup -q
 %patch2 -p1 -b .pkgconfig
 %patch3 -p1 -b .conflict
-%patch4 -p1 -b .aqofxconnect_qt4
+%patch4 -p1 -b .q4banking_remove_qt3
 
 # hack to nuke rpaths, slighly less ugly than using overriding LIBTOOL below
 %if "%{_libdir}" != "/usr/lib"
@@ -229,6 +229,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 22 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.2.4-6
+- q4banking: try harder to purge qt3 dep (#626008)
+
 * Sun Aug 22 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.2.4-5
 - rebase pkgconfig patch
 - q4banking should not depend on qt3 (#626008)