From 95363287598af2bf91b9a296460e33ade76b876f Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Dec 22 2005 07:44:46 +0000
Subject: update to 1.8.1beta

- use pkgconfig, not <blah>-config
- don't run *GLADE* during the build process. eek.

---

diff --git a/.cvsignore b/.cvsignore
index f601c5e..2ca96c0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
-aqbanking-1.0.4beta.tar.gz
+aqbanking-1.8.1beta.tar.gz
+aqbanking-1.8.1beta-gladesrc.tar.gz
diff --git a/aqbanking-libdir.patch b/aqbanking-libdir.patch
index 6f23c45..3d716bf 100644
--- a/aqbanking-libdir.patch
+++ b/aqbanking-libdir.patch
@@ -1,30 +1,11 @@
---- aqbanking-1.0.4beta/configure.moo	2005-02-09 15:42:46.000000000 -0500
-+++ aqbanking-1.0.4beta/configure	2005-02-09 15:42:56.000000000 -0500
-@@ -20334,10 +20334,10 @@
- case "$OS_TYPE" in
-     posix)
-         aqbanking_internal_libs="-laqbanking"
--        aqbanking_libs="-L`eval echo $prefix/lib` ${aqbanking_internal_libs}"
--        aqbanking_libspp="-L`eval echo $prefix/lib` -laqbankingpp"
-+        aqbanking_libs="-L`eval echo $libdir` ${aqbanking_internal_libs}"
-+        aqbanking_libspp="-L`eval echo $libdir` -laqbankingpp"
-         aqbanking_includes="-I`eval echo $prefix/include`"
--        aqbanking_plugins="`eval echo $prefix/lib`/aqbanking/plugins/${AQBANKING_SO_EFFECTIVE}"
-+        aqbanking_plugins="`eval echo $libdir`/aqbanking/plugins/${AQBANKING_SO_EFFECTIVE}"
-         aqbanking_data="`eval echo $prefix/share`/aqbanking"
-     	;;
-     windows)
-@@ -21148,10 +21148,10 @@
+--- aqbanking-1.8.1beta/configure.orig	2005-12-15 09:36:37.000000000 -0500
++++ aqbanking-1.8.1beta/configure	2005-12-20 16:07:37.000000000 -0500
+@@ -33193,7 +33193,7 @@
+ _ACEOF
  
- 
-         aqbanking_internal_libs="-laqbanking32_${AQBANKING_SO_EFFECTIVE}"
--        aqbanking_libs="-L`eval echo $prefix/lib` ${aqbanking_internal_libs}"
--        aqbanking_libspp="-L`eval echo $prefix/lib` -laqbankingpp32"
-+        aqbanking_libs="-L`eval echo $libdir` ${aqbanking_internal_libs}"
-+        aqbanking_libspp="-L`eval echo $libdir` -laqbankingpp32"
-         aqbanking_includes="-I`eval echo $prefix/include`"
--        aqbanking_plugins="`eval echo $prefix/lib`/aqbanking/plugins/${AQBANKING_SO_EFFECTIVE}"
-+        aqbanking_plugins="`eval echo $libdir`/aqbanking/plugins/${AQBANKING_SO_EFFECTIVE}"
-         aqbanking_data="`eval echo $prefix/share`/aqbanking"
-     	;;
- esac
+         g2banking_internal_libs="${abs_top_builddir}/src/frontends/g2banking/libg2banking.la"
+-        g2banking_libs="-L`eval echo $prefix/lib` -lg2banking-${G2BANKING_SO_EFFECTIVE}"
++        g2banking_libs="-L\${libdir} -lg2banking-${G2BANKING_SO_EFFECTIVE}"
+         g2banking_includes="-I`eval echo $prefix/include`"
+         g2banking_data="\${datadir}/g2banking"
+ 	all_includes="$all_includes -mms-bitfields"
diff --git a/aqbanking.spec b/aqbanking.spec
index a1fe5b5..4184fac 100644
--- a/aqbanking.spec
+++ b/aqbanking.spec
@@ -1,16 +1,20 @@
 Name: aqbanking
 Summary: A library for online banking functions and financial data import/export.
-Version: 1.0.4beta
-Release: 2.1
+Version: 1.8.1beta
+Release: 1
 Source: http://download.sourceforge.net/aqbanking/%{name}-%{version}.tar.gz
+Source1: aqbanking-%{version}-gladesrc.tar.gz
 Group: System Environment/Libraries
 License: GPL
 URL: http://sourceforge.net/projects/aqbanking
 Patch: aqbanking-libdir.patch
+Patch2: aqbanking-aclocal.patch
+Patch3: aqbanking-1.8.1beta-noglade.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: gwenhywfar-devel
+BuildRequires: gwenhywfar-devel qt-devel
 BuildRequires: libofx >= 0.7.0
 Prereq: /sbin/ldconfig
+Obsoletes: aqhbci
 
 %description 
 The intention of AqBanking is to provide a middle layer between the
@@ -27,16 +31,23 @@ Summary: Aqbanking development kit
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: gwenhywfar-devel
+Obsoletes: aqhbci-devel
+
 %description devel
 This package contains aqbanking-config and header files for writing and
 compiling programs using Aqbanking.
 
 %prep
-%setup -q
+%setup -q -b 1
 %patch -p1
+%patch3 -p1
+%patch2 -p1
 
 %build
-%{configure} --disable-static
+[ -z "$QTDIR" ] && . /etc/profile.d/qt.sh
+autoconf
+%{configure} --disable-static --with-backends="aqhbci aqdtaus aqofxconnect" \
+  --with-frontends="cbanking qbanking" --enable-python
 make
 
 %install
@@ -46,6 +57,11 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 find $RPM_BUILD_ROOT -name *.la -exec rm -f {} \;
 
+rm -f $RPM_BUILD_ROOT/%{_bindir}/*-config
+
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}
+mv $RPM_BUILD_ROOT/%{_datadir}/doc/{aqbanking,aqhbci} $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}
+
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
@@ -61,14 +77,18 @@ find $RPM_BUILD_ROOT -name *.la -exec rm -f {} \;
 %{_libdir}/gwenhywfar
 %{_datadir}/%{name}
 %{_datadir}/locale/*/LC_MESSAGES/%{name}.mo
+/usr/lib/python2.4/site-packages/%{name}
+%{_datadir}/aqhbci
+%{_bindir}/*-tool
 
 %files devel
 %defattr(-,root,root)
-%{_bindir}/aqbanking-config
+%{_bindir}/hbcixml2
 %{_libdir}/*.so
-%{_includedir}/aqbanking
-%{_includedir}/aqbanking++
-%{_datadir}/aclocal/aqbanking.m4
+%{_includedir}/*
+%{_libdir}/pkgconfig/*
+%{_datadir}/aclocal/*
+
 
 %changelog
 * Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
diff --git a/sources b/sources
index 8dcf358..0fc4699 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-a4adf93a4c9ecc68c3eaf0ed5828c5c2  aqbanking-1.0.4beta.tar.gz
+8d1ac71e00763fdba69ef438508bbd6e  aqbanking-1.8.1beta.tar.gz
+6a8518ae5685b09cc3e9cc4cdb26e5e0  aqbanking-1.8.1beta-gladesrc.tar.gz