rpms/aqbanking/devel aqbanking-2.1.0-pkgconfig.patch, 1.1, 1.2 aqbanking.spec, 1.21, 1.22
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Sep 1 21:27:15 UTC 2006
- Previous message (by thread): rpms/mkinitrd/devel .cvsignore, 1.128, 1.129 mkinitrd.spec, 1.157, 1.158 sources, 1.155, 1.156
- Next message (by thread): rpms/mkinitrd/devel mkinitrd.spec,1.158,1.159 sources,1.156,1.157
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: notting
Update of /cvs/dist/rpms/aqbanking/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13461
Modified Files:
aqbanking-2.1.0-pkgconfig.patch aqbanking.spec
Log Message:
start fixing multilib conflicts
aqbanking-2.1.0-pkgconfig.patch:
aqbanking-config.in.in | 18 +++++++++---------
src/frontends/cbanking/cbanking-config.in.in | 11 +++--------
src/frontends/g2banking/g2banking-config.in.in | 11 +++--------
src/frontends/kbanking/kbanking-config.in.in | 11 +++--------
src/frontends/qbanking/lib/qbanking-config.in.in | 15 +++++----------
5 files changed, 23 insertions(+), 43 deletions(-)
Index: aqbanking-2.1.0-pkgconfig.patch
===================================================================
RCS file: /cvs/dist/rpms/aqbanking/devel/aqbanking-2.1.0-pkgconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aqbanking-2.1.0-pkgconfig.patch 15 Jul 2006 03:03:12 -0000 1.1
+++ aqbanking-2.1.0-pkgconfig.patch 1 Sep 2006 21:27:12 -0000 1.2
@@ -1,7 +1,15 @@
-diff -ru aqbanking-2.1.0/aqbanking-config.in.in aqbanking-2.1.0.fixed/aqbanking-config.in.in
---- aqbanking-2.1.0/aqbanking-config.in.in 2006-04-03 15:30:43.000000000 -0400
-+++ aqbanking-2.1.0.fixed/aqbanking-config.in.in 2006-07-14 17:08:28.000000000 -0400
-@@ -10,19 +10,19 @@
+--- aqbanking-2.1.0/aqbanking-config.in.in.pkgconfig 2006-04-03 15:30:43.000000000 -0400
++++ aqbanking-2.1.0/aqbanking-config.in.in 2006-09-01 17:25:21.000000000 -0400
+@@ -1,28 +1,24 @@
+ # $Id$
+ # Author of this file: Martin Preuss<martin at libchipcard.de>
+
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-
+ result=""
+
for d in $*; do
case $d in
--includes)
@@ -26,50 +34,64 @@
;;
--vmajor)
result="$result @AQBANKING_VERSION_MAJOR@"
-diff -ru aqbanking-2.1.0/src/frontends/cbanking/cbanking-config.in.in aqbanking-2.1.0.fixed/src/frontends/cbanking/cbanking-config.in.in
---- aqbanking-2.1.0/src/frontends/cbanking/cbanking-config.in.in 2006-04-03 15:30:32.000000000 -0400
-+++ aqbanking-2.1.0.fixed/src/frontends/cbanking/cbanking-config.in.in 2006-07-14 17:00:24.000000000 -0400
-@@ -11,13 +11,13 @@
+@@ -57,3 +53,7 @@
+ esac
+ done
+ echo $result
++./src/frontends/qbanking/lib/qbanking-config.in.in.pkgconfig
++./src/frontends/kbanking/kbanking-config.in.in.pkgconfig
++./src/frontends/cbanking/cbanking-config.in.in.pkgconfig
++./src/frontends/g2banking/g2banking-config.in.in.pkgconfig
+--- aqbanking-2.1.0/src/frontends/qbanking/lib/qbanking-config.in.in.pkgconfig 2006-04-03 15:30:30.000000000 -0400
++++ aqbanking-2.1.0/src/frontends/qbanking/lib/qbanking-config.in.in 2006-09-01 17:26:12.000000000 -0400
+@@ -1,29 +1,24 @@
+ # $Id$
+ # Author of this file: Martin Preuss<martin at libchipcard.de>
+
+-prefix="@prefix@"
+-exec_prefix="@exec_prefix@"
+-libdir="@libdir@"
+-datadir="@datadir@"
+-
+ result=""
+
for d in $*; do
case $d in
--includes)
-- result="$result @all_includes@ @cbanking_includes@"
-+ result="$result $(pkg-config --cflags aqbanking) $(pkg-config --variable=cbanking_includes aqbanking)"
+- result="$result @qbanking_includes@ @aqbanking_includes@ @gwenhywfar_includes@ @qt3_includes@"
++ result="$result $(pkg-config --cflags aqbanking) $(pkg-config --variable=qbanking_includes aqbanking) $(pkg-config --cflags gwenhywfar) $(pkg-config --cflags qt-mt)"
;;
--libraries)
-- result="$result @cbanking_libs@"
-+ result="$result $(pkg-config --variable=cbanking_libs aqbanking)"
- ;;
- --data)
-- result="$result @cbanking_data@"
-+ result="$result $(pkg-config --variable=cbanking_datadir aqbanking)"
- ;;
- --vmajor)
- result="$result @CBANKING_VERSION_MAJOR@"
-diff -ru aqbanking-2.1.0/src/frontends/g2banking/g2banking-config.in.in aqbanking-2.1.0.fixed/src/frontends/g2banking/g2banking-config.in.in
---- aqbanking-2.1.0/src/frontends/g2banking/g2banking-config.in.in 2006-04-03 15:30:23.000000000 -0400
-+++ aqbanking-2.1.0.fixed/src/frontends/g2banking/g2banking-config.in.in 2006-07-14 17:08:00.000000000 -0400
-@@ -11,13 +11,13 @@
- for d in $*; do
- case $d in
- --includes)
-- result="$result @all_includes@ @g2banking_includes@"
-+ result="$result $(pkg-config --cflags aqbanking) $(pkg-config --variable=g2banking_includes aqbanking)"
+- result="$result @qbanking_libs@"
++ result="$result $(pkg-config --variable=qbanking_libs aqbanking)"
;;
- --libraries)
-- result="$result @g2banking_libs@"
-+ result="$result $(pkg-config --variable=g2banking_libs aqbanking)"
+ --plugins)
+- result="$result @qbanking_plugindir@"
++ result="$result $(pkg-config --variable=aqbanking_plugindir)/frontends/qbanking"
;;
--data)
-- result="$result @g2banking_data@"
-+ result="$result $(pkg-config --variable=g2banking_datadir aqbanking)"
+- result="$result @qbanking_data@"
++ result="$result $(pkg-config --variable=pkgdatadir aqbanking)/frontends/qbanking"
+ ;;
+ --helpdir)
+- result="$result @qbanking_helpdir@"
++ result="$result $(pkg-config --variable=pkgdatadir aqbanking)/frontends/qbanking/help"
;;
--vmajor)
- result="$result @G2BANKING_VERSION_MAJOR@"
-diff -ru aqbanking-2.1.0/src/frontends/kbanking/kbanking-config.in.in aqbanking-2.1.0.fixed/src/frontends/kbanking/kbanking-config.in.in
---- aqbanking-2.1.0/src/frontends/kbanking/kbanking-config.in.in 2006-04-03 15:30:24.000000000 -0400
-+++ aqbanking-2.1.0.fixed/src/frontends/kbanking/kbanking-config.in.in 2006-07-14 17:01:26.000000000 -0400
-@@ -11,13 +11,13 @@
+ result="$result @QBANKING_VERSION_MAJOR@"
+--- aqbanking-2.1.0/src/frontends/kbanking/kbanking-config.in.in.pkgconfig 2006-04-03 15:30:24.000000000 -0400
++++ aqbanking-2.1.0/src/frontends/kbanking/kbanking-config.in.in 2006-09-01 17:26:17.000000000 -0400
+@@ -1,23 +1,18 @@
+ # $Id$
+ # Author of this file: Martin Preuss<martin at libchipcard.de>
+
+-prefix="@prefix@"
+-exec_prefix="@exec_prefix@"
+-libdir="@libdir@"
+-datadir="@datadir@"
+-
+ result=""
+
for d in $*; do
case $d in
--includes)
@@ -86,31 +108,61 @@
;;
--vmajor)
result="$result @KBANKING_VERSION_MAJOR@"
-diff -ru aqbanking-2.1.0/src/frontends/qbanking/lib/qbanking-config.in.in aqbanking-2.1.0.fixed/src/frontends/qbanking/lib/qbanking-config.in.in
---- aqbanking-2.1.0/src/frontends/qbanking/lib/qbanking-config.in.in 2006-04-03 15:30:30.000000000 -0400
-+++ aqbanking-2.1.0.fixed/src/frontends/qbanking/lib/qbanking-config.in.in 2006-07-14 17:07:03.000000000 -0400
-@@ -11,19 +11,19 @@
+--- aqbanking-2.1.0/src/frontends/cbanking/cbanking-config.in.in.pkgconfig 2006-04-03 15:30:32.000000000 -0400
++++ aqbanking-2.1.0/src/frontends/cbanking/cbanking-config.in.in 2006-09-01 17:26:20.000000000 -0400
+@@ -1,23 +1,18 @@
+ # $Id$
+ # Author of this file: Martin Preuss<martin at libchipcard.de>
+
+-prefix="@prefix@"
+-exec_prefix="@exec_prefix@"
+-libdir="@libdir@"
+-datadir="@datadir@"
+-
+ result=""
+
for d in $*; do
case $d in
--includes)
-- result="$result @qbanking_includes@ @aqbanking_includes@ @gwenhywfar_includes@ @qt3_includes@"
-+ result="$result $(pkg-config --cflags aqbanking) $(pkg-config --variable=qbanking_includes aqbanking) $(pkg-config --cflags gwenhywfar) $(pkg-config --cflags qt-mt)"
+- result="$result @all_includes@ @cbanking_includes@"
++ result="$result $(pkg-config --cflags aqbanking) $(pkg-config --variable=cbanking_includes aqbanking)"
;;
--libraries)
-- result="$result @qbanking_libs@"
-+ result="$result $(pkg-config --variable=qbanking_libs aqbanking)"
- ;;
- --plugins)
-- result="$result @qbanking_plugindir@"
-+ result="$result $(pkg-config --variable=aqbanking_plugindir)/frontends/qbanking"
+- result="$result @cbanking_libs@"
++ result="$result $(pkg-config --variable=cbanking_libs aqbanking)"
;;
--data)
-- result="$result @qbanking_data@"
-+ result="$result $(pkg-config --variable=pkgdatadir aqbanking)/frontends/qbanking"
+- result="$result @cbanking_data@"
++ result="$result $(pkg-config --variable=cbanking_datadir aqbanking)"
;;
- --helpdir)
-- result="$result @qbanking_helpdir@"
-+ result="$result $(pkg-config --variable=pkgdatadir aqbanking)/frontends/qbanking/help"
+ --vmajor)
+ result="$result @CBANKING_VERSION_MAJOR@"
+--- aqbanking-2.1.0/src/frontends/g2banking/g2banking-config.in.in.pkgconfig 2006-04-03 15:30:23.000000000 -0400
++++ aqbanking-2.1.0/src/frontends/g2banking/g2banking-config.in.in 2006-09-01 17:26:22.000000000 -0400
+@@ -1,23 +1,18 @@
+ # $Id$
+ # Author of this file: Martin Preuss<martin at libchipcard.de>
+
+-prefix="@prefix@"
+-exec_prefix="@exec_prefix@"
+-libdir="@libdir@"
+-datadir="@datadir@"
+-
+ result=""
+
+ for d in $*; do
+ case $d in
+ --includes)
+- result="$result @all_includes@ @g2banking_includes@"
++ result="$result $(pkg-config --cflags aqbanking) $(pkg-config --variable=g2banking_includes aqbanking)"
+ ;;
+ --libraries)
+- result="$result @g2banking_libs@"
++ result="$result $(pkg-config --variable=g2banking_libs aqbanking)"
+ ;;
+ --data)
+- result="$result @g2banking_data@"
++ result="$result $(pkg-config --variable=g2banking_datadir aqbanking)"
;;
--vmajor)
- result="$result @QBANKING_VERSION_MAJOR@"
+ result="$result @G2BANKING_VERSION_MAJOR@"
Index: aqbanking.spec
===================================================================
RCS file: /cvs/dist/rpms/aqbanking/devel/aqbanking.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- aqbanking.spec 28 Aug 2006 20:59:42 -0000 1.21
+++ aqbanking.spec 1 Sep 2006 21:27:12 -0000 1.22
@@ -1,7 +1,7 @@
Name: aqbanking
Summary: A library for online banking functions and financial data import/export.
Version: 2.1.0
-Release: 4
+Release: 5
Source: http://download.sourceforge.net/aqbanking/%{name}-%{version}.tar.gz
Group: System Environment/Libraries
License: GPL
@@ -37,8 +37,8 @@
%prep
%setup -q
-%patch -p1
-%patch2 -p1
+%patch -p1 -b .lib
+%patch2 -p1 -b .pkgconfig
%build
[ -z "$QTDIR" ] && . /etc/profile.d/qt.sh
@@ -88,6 +88,9 @@
%changelog
+* Fri Sep 1 2006 Bill Nottingham <notting at redhat.com> - 2.1.0-5
+- fix multilib conficts
+
* Mon Aug 28 2006 Bill Nottingham <notting at redhat.com> - 2.1.0-4
- rebuild against latest libofx
- Previous message (by thread): rpms/mkinitrd/devel .cvsignore, 1.128, 1.129 mkinitrd.spec, 1.157, 1.158 sources, 1.155, 1.156
- Next message (by thread): rpms/mkinitrd/devel mkinitrd.spec,1.158,1.159 sources,1.156,1.157
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list