rpms/aqbanking/devel aqbanking-2.1.0-pkgconfig.patch, NONE, 1.1 aqbanking-2.1.0-visibility.patch, NONE, 1.1 aqbanking.spec, 1.18, 1.19 aqbanking-aclocal.patch, 1.2, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Jul 15 03:03:16 UTC 2006
Author: notting
Update of /cvs/dist/rpms/aqbanking/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32091
Modified Files:
aqbanking.spec
Added Files:
aqbanking-2.1.0-pkgconfig.patch
aqbanking-2.1.0-visibility.patch
Removed Files:
aqbanking-aclocal.patch
Log Message:
port *-config to pkgconfig
turn off -fvisiblity=hidden for now
aqbanking-2.1.0-pkgconfig.patch:
aqbanking-config.in.in | 10 +++++-----
src/frontends/cbanking/cbanking-config.in.in | 6 +++---
src/frontends/g2banking/g2banking-config.in.in | 6 +++---
src/frontends/kbanking/kbanking-config.in.in | 6 +++---
src/frontends/qbanking/lib/qbanking-config.in.in | 10 +++++-----
5 files changed, 19 insertions(+), 19 deletions(-)
--- NEW FILE aqbanking-2.1.0-pkgconfig.patch ---
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 @@
for d in $*; do
case $d in
--includes)
- result="$result @aqbanking_includes@ @gwenhywfar_includes@"
+ result="$result $(pkg-config --cflags aqbanking)"
;;
--libraries)
- result="$result @aqbanking_ldflags@ @aqbanking_libs@"
+ result="$result $(pkg-config --libs aqbanking)"
;;
--libraries++)
- result="$result @aqbanking_ldflags@ @aqbanking_libspp@"
+ result="$result $(pkg-config --variable=librariespp aqbanking)"
;;
--plugins)
- result="$result @aqbanking_plugindir@"
+ result="$result $(pkg-config --variable=plugindir aqbanking)"
;;
--data)
- result="$result @aqbanking_pkgdatadir@"
+ result="$result $(pkg-conifg --variable=pkgdatadir aqbanking)"
;;
--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 @@
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)"
;;
--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)"
;;
--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 @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 @@
for d in $*; do
case $d in
--includes)
- result="$result @all_includes@ @kbanking_includes@"
+ result="$result $(pkg-config --cflags aqbanking) $(pkg-config --variable=kbanking_includes aqbanking)"
;;
--libraries)
- result="$result @kbanking_libs@"
+ result="$result $(pkg-config --variable=kbanking_libs aqbanking)"
;;
--data)
- result="$result @kbanking_data@"
+ result="$result $(pkg-config --variable=kbanking_datadir aqbanking)"
;;
--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 @@
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)"
;;
--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"
;;
--data)
- 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 @QBANKING_VERSION_MAJOR@"
aqbanking-2.1.0-visibility.patch:
configure | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE aqbanking-2.1.0-visibility.patch ---
--- aqbanking-2.1.0/configure.moo 2006-07-14 22:56:01.000000000 -0400
+++ aqbanking-2.1.0/configure 2006-07-14 22:56:18.000000000 -0400
@@ -27040,7 +27040,7 @@
gcc*)
gccversion=`$CC --version | { read x1 x2 x3; echo $x3; }`
case $gccversion in
- 0.* | 1.* | 2.* | 3.*)
+ 0.* | 1.* | 2.* | 3.* | 4.*)
visibility_supported="no (needs gcc >=4.0, you have $gccversion)"
;;
*)
Index: aqbanking.spec
===================================================================
RCS file: /cvs/dist/rpms/aqbanking/devel/aqbanking.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- aqbanking.spec 12 Jul 2006 05:12:42 -0000 1.18
+++ aqbanking.spec 15 Jul 2006 03:03:12 -0000 1.19
@@ -1,13 +1,14 @@
Name: aqbanking
Summary: A library for online banking functions and financial data import/export.
Version: 2.1.0
-Release: 1.1
+Release: 2
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-aclocal.patch
+Patch2: aqbanking-2.1.0-pkgconfig.patch
+Patch3: aqbanking-2.1.0-visibility.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: gwenhywfar-devel >= 1.99.2 qt-devel
BuildRequires: libofx-devel >= 0.7.0, gettext, autoconf, libtool
@@ -39,10 +40,10 @@
%setup -q
%patch -p1
%patch2 -p1
+%patch3 -p1
%build
[ -z "$QTDIR" ] && . /etc/profile.d/qt.sh
-autoconf
%{configure} --disable-static --with-backends="aqhbci aqdtaus aqofxconnect" \
--with-frontends="cbanking qbanking" --enable-python
make LIBTOOL=/usr/bin/libtool
@@ -55,9 +56,6 @@
find $RPM_BUILD_ROOT -name *.la -exec rm -f {} \;
find $RPM_BUILD_ROOT -name *.a -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}
@@ -84,6 +82,7 @@
%files devel
%defattr(-,root,root)
%{_bindir}/hbcixml2
+%{_bindir}/*-config
%{_libdir}/*.so
%{_includedir}/*
%{_libdir}/pkgconfig/*
@@ -91,6 +90,10 @@
%changelog
+* Fri Jul 14 2006 Bill Nottingham <notting at redhat.com> - 2.1.0-2
+- port *-config to pkgconfig
+- don't use -fvisibility=hidden
+
* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.1.0-1.1
- rebuild
--- aqbanking-aclocal.patch DELETED ---
More information about the fedora-cvs-commits
mailing list