[aqbanking] - rebase pkgconfig patch - q4banking should not depend on qt3 (#626008) - include %check section, th

Sun Aug 22 14:30:53 UTC 2010

commit bc1c235eb2197317cb301837855f6037421b52de
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Aug 22 09:35:48 2010 -0500

    - rebase pkgconfig patch
    - q4banking should not depend on qt3 (#626008)
    - include %check section, though currently mostly useless

 aqbanking-4.2.4-aqofxconnect_qt4.patch             |   24 ++++++++++++++++
 ...config.patch => aqbanking-4.2.4-pkgconfig.patch |   16 +++++-----
 aqbanking.spec                                     |   29 +++++++++++++++++---
 3 files changed, 57 insertions(+), 12 deletions(-)
---

diff --git a/aqbanking-4.2.4-aqofxconnect_qt4.patch b/aqbanking-4.2.4-aqofxconnect_qt4.patch
new file mode 100644
index 0000000..1f306d1
--- /dev/null
+++ b/aqbanking-4.2.4-aqofxconnect_qt4.patch
@@ -0,0 +1,24 @@
+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 09:12:32.574380692 -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 09:13:39.961380650 -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-3.7.2-pkgconfig.patch b/aqbanking-4.2.4-pkgconfig.patch
similarity index 74%
rename from aqbanking-3.7.2-pkgconfig.patch
rename to aqbanking-4.2.4-pkgconfig.patch
index ed78935..5b32d13 100644
--- a/aqbanking-3.7.2-pkgconfig.patch
+++ b/aqbanking-4.2.4-pkgconfig.patch
@@ -1,8 +1,8 @@
-diff -up aqbanking-3.7.2/aqbanking-config.in.in.pkgconfig aqbanking-3.7.2/aqbanking-config.in.in
---- aqbanking-3.7.2/aqbanking-config.in.in.pkgconfig	2008-07-31 14:13:31.000000000 -0400
-+++ aqbanking-3.7.2/aqbanking-config.in.in	2008-09-09 13:18:20.000000000 -0400
+diff -up aqbanking-4.2.4/aqbanking-config.in.in.pkgconfig aqbanking-4.2.4/aqbanking-config.in.in
+--- aqbanking-4.2.4/aqbanking-config.in.in.pkgconfig	2008-10-03 11:41:22.000000000 -0500
++++ aqbanking-4.2.4/aqbanking-config.in.in	2010-08-22 08:53:05.765381232 -0500
 @@ -1,50 +1,44 @@
- # $Id: aqbanking-3.7.2-pkgconfig.patch,v 1.1 2008/09/09 19:55:27 notting Exp $
+ # $Id$
  # Author of this file: Martin Preuss<martin at libchipcard.de>
  
 -prefix=@prefix@
@@ -17,7 +17,7 @@ diff -up aqbanking-3.7.2/aqbanking-config.in.in.pkgconfig aqbanking-3.7.2/aqbank
      case $d in
  	--includes)
 -	    result="$result @aqbanking_includes@ @gwenhywfar_includes@"
-+	    result="$result $(pkg-config --cflags aqbanking)"
++	    result="$result $(pkg-config --cflags aqbanking)" 
  	    ;;
  	--libraries)
 -	    result="$result @aqbanking_ldflags@ @aqbanking_libs@"
@@ -60,9 +60,9 @@ diff -up aqbanking-3.7.2/aqbanking-config.in.in.pkgconfig aqbanking-3.7.2/aqbank
  	    ;;
  
  	--vmajor)
-diff -up aqbanking-3.7.2/aqbanking.pc.in.pkgconfig aqbanking-3.7.2/aqbanking.pc.in
---- aqbanking-3.7.2/aqbanking.pc.in.pkgconfig	2008-09-09 13:16:24.000000000 -0400
-+++ aqbanking-3.7.2/aqbanking.pc.in	2008-09-09 13:18:22.000000000 -0400
+diff -up aqbanking-4.2.4/aqbanking.pc.in.pkgconfig aqbanking-4.2.4/aqbanking.pc.in
+--- aqbanking-4.2.4/aqbanking.pc.in.pkgconfig	2008-10-03 11:41:22.000000000 -0500
++++ aqbanking-4.2.4/aqbanking.pc.in	2010-08-22 08:44:46.282391195 -0500
 @@ -32,6 +32,8 @@ kbanking_datadir=@kbanking_data@
  qbanking_includes=@qbanking_includes@
  qbanking_libs=@qbanking_libs@
diff --git a/aqbanking.spec b/aqbanking.spec
index fd21296..7e5be56 100644
--- a/aqbanking.spec
+++ b/aqbanking.spec
@@ -8,14 +8,16 @@
 Name: aqbanking
 Summary: A library for online banking functions and financial data import/export
 Version: 4.2.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 # Download is PHP form at http://www.aquamaniac.de/sites/download/packages.php
 Source: %{name}-%{version}.tar.gz
 Group: System Environment/Libraries
 License: GPLv2+
 URL: http://www.aquamaniac.de/aqbanking/
-Patch2: aqbanking-3.7.2-pkgconfig.patch
+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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # qbanking
 BuildRequires: %{qt3pkg}-devel
@@ -95,6 +97,12 @@ Requires: qt4-devel
 %setup -q
 %patch2 -p1 -b .pkgconfig
 %patch3 -p1 -b .conflict
+%patch4 -p1 -b .aqofxconnect_qt4
+
+# hack to nuke rpaths, slighly less ugly than using overriding LIBTOOL below
+%if "%{_libdir}" != "/usr/lib"
+sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
+%endif
 
 %build
 [ -z "$QTDIR" ] && . /etc/profile.d/qt.sh
@@ -108,12 +116,16 @@ Requires: qt4-devel
   --with-qt4-moc=moc-qt4 \
   --with-qt4-uic=uic-qt4
 
-make LIBTOOL=/usr/bin/libtool
+# not smp_mflags safe
+# override LIBTOOL to quash rpath
+make 
+#LIBTOOL=/usr/bin/libtool
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool install
+make install DESTDIR=$RPM_BUILD_ROOT
+# LIBTOOL=/usr/bin/libtool 
 
 find $RPM_BUILD_ROOT -name *.la -exec rm -f {} \;
 find $RPM_BUILD_ROOT -name *.a -exec rm -f {} \;
@@ -132,6 +144,10 @@ mv AUTHORS README COPYING ChangeLog NEWS $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}
 # Fix multilib errors. (#602879)
 sed -i 's|** Created:.*|** Created |g' $RPM_BUILD_ROOT/%{_includedir}/q4banking/*.ui.h
 
+%check
+## meh, requires X server
+make check ||:
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -213,6 +229,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 22 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.2.4-5
+- rebase pkgconfig patch
+- q4banking should not depend on qt3 (#626008)
+- include %%check section, though currently mostly useless
+
 * Fri Jun 25 2010 Bill Nottingham <notting at redhat.com> - 4.2.4-4
 - fix multilib errors (#602879)
 
