diff --git a/aqbanking-2.1.0-conflict.patch b/aqbanking-2.1.0-conflict.patch new file mode 100644 index 0000000..9c54910 --- /dev/null +++ b/aqbanking-2.1.0-conflict.patch @@ -0,0 +1,11 @@ +--- aqbanking-2.1.0/configure.foo 2006-09-05 10:02:03.000000000 -0400 ++++ aqbanking-2.1.0/configure 2006-09-05 10:02:16.000000000 -0400 +@@ -2548,7 +2548,7 @@ + # + # datetime + # +-DATETIME="`date +\"%Y%m%d%H%M%S\"`" ++DATETIME="`date +\"%Y%m%d\"`" + + + diff --git a/aqbanking.spec b/aqbanking.spec index bf3a2e0..351de86 100644 --- a/aqbanking.spec +++ b/aqbanking.spec @@ -1,13 +1,14 @@ Name: aqbanking Summary: A library for online banking functions and financial data import/export. Version: 2.1.0 -Release: 5 +Release: 6 Source: http://download.sourceforge.net/aqbanking/%{name}-%{version}.tar.gz Group: System Environment/Libraries License: GPL URL: http://sourceforge.net/projects/aqbanking Patch: aqbanking-libdir.patch Patch2: aqbanking-2.1.0-pkgconfig.patch +Patch3: aqbanking-2.1.0-conflict.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gwenhywfar-devel >= 1.99.2 qt-devel BuildRequires: libofx-devel >= 0.7.0, gettext, autoconf, libtool @@ -39,6 +40,7 @@ compiling programs using Aqbanking. %setup -q %patch -p1 -b .lib %patch2 -p1 -b .pkgconfig +%patch3 -p1 -b .conflict %build [ -z "$QTDIR" ] && . /etc/profile.d/qt.sh @@ -88,7 +90,7 @@ mv $RPM_BUILD_ROOT/%{_datadir}/doc/{aqbanking,aqhbci} $RPM_BUILD_ROOT/%{_datadir %changelog -* Fri Sep 1 2006 Bill Nottingham - 2.1.0-5 +* Fri Sep 1 2006 Bill Nottingham - 2.1.0-6 - fix multilib conficts * Mon Aug 28 2006 Bill Nottingham - 2.1.0-4