rpms/aqbanking/devel aqbanking-2.1.0-conflict.patch, NONE, 1.1 aqbanking.spec, 1.22, 1.23

[fedora-cvs-commits at redhat.com]

Author: notting

Update of /cvs/dist/rpms/aqbanking/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30609

Modified Files:
	aqbanking.spec 
Added Files:
	aqbanking-2.1.0-conflict.patch 
Log Message:
fix more conflicts


aqbanking-2.1.0-conflict.patch:
 configure |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE aqbanking-2.1.0-conflict.patch ---
--- 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\"`"
 
 
 


Index: aqbanking.spec
===================================================================
RCS file: /cvs/dist/rpms/aqbanking/devel/aqbanking.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- aqbanking.spec	1 Sep 2006 21:27:12 -0000	1.22
+++ aqbanking.spec	5 Sep 2006 14:03:45 -0000	1.23
@@ -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 @@
 %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 @@
 
 
 %changelog
-* Fri Sep  1 2006 Bill Nottingham <notting at redhat.com> - 2.1.0-5
+* Fri Sep  1 2006 Bill Nottingham <notting at redhat.com> - 2.1.0-6
 - fix multilib conficts
 
 * Mon Aug 28 2006 Bill Nottingham <notting at redhat.com> - 2.1.0-4