From a4f28ca02fdf1b2f010bea88549a211ee59e7315 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Sep 05 2006 15:15:21 +0000 Subject: more fixing --- diff --git a/aqbanking-2.1.0-pkgconfig.patch b/aqbanking-2.1.0-pkgconfig.patch index 2962053..f0f93a4 100644 --- a/aqbanking-2.1.0-pkgconfig.patch +++ b/aqbanking-2.1.0-pkgconfig.patch @@ -1,7 +1,7 @@ --- 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: aqbanking-2.1.0-pkgconfig.patch,v 1.2 2006/09/01 21:27:12 notting Exp $ + # $Id: aqbanking-2.1.0-pkgconfig.patch,v 1.3 2006/09/05 15:15:21 notting Exp $ # Author of this file: Martin Preuss -prefix=@prefix@ @@ -45,7 +45,7 @@ --- 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: aqbanking-2.1.0-pkgconfig.patch,v 1.2 2006/09/01 21:27:12 notting Exp $ + # $Id: aqbanking-2.1.0-pkgconfig.patch,v 1.3 2006/09/05 15:15:21 notting Exp $ # Author of this file: Martin Preuss -prefix="@prefix@" @@ -82,7 +82,7 @@ --- 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: aqbanking-2.1.0-pkgconfig.patch,v 1.2 2006/09/01 21:27:12 notting Exp $ + # $Id: aqbanking-2.1.0-pkgconfig.patch,v 1.3 2006/09/05 15:15:21 notting Exp $ # Author of this file: Martin Preuss -prefix="@prefix@" @@ -111,7 +111,7 @@ --- 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: aqbanking-2.1.0-pkgconfig.patch,v 1.2 2006/09/01 21:27:12 notting Exp $ + # $Id: aqbanking-2.1.0-pkgconfig.patch,v 1.3 2006/09/05 15:15:21 notting Exp $ # Author of this file: Martin Preuss -prefix="@prefix@" @@ -140,7 +140,7 @@ --- 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: aqbanking-2.1.0-pkgconfig.patch,v 1.2 2006/09/01 21:27:12 notting Exp $ + # $Id: aqbanking-2.1.0-pkgconfig.patch,v 1.3 2006/09/05 15:15:21 notting Exp $ # Author of this file: Martin Preuss -prefix="@prefix@" @@ -166,3 +166,45 @@ ;; --vmajor) result="$result @G2BANKING_VERSION_MAJOR@" +--- aqbanking-2.1.0/src/plugins/backends/aqdtaus/aqdtaus-config.in.in.foo 2006-09-05 11:14:20.000000000 -0400 ++++ aqbanking-2.1.0/src/plugins/backends/aqdtaus/aqdtaus-config.in.in 2006-09-05 11:14:34.000000000 -0400 +@@ -1,17 +1,12 @@ + # $Id: aqbanking-2.1.0-pkgconfig.patch,v 1.3 2006/09/05 15:15:21 notting Exp $ + # Author of this file: Martin Preuss + +-prefix="@prefix@" +-exec_prefix="@exec_prefix@" +-libdir="@libdir@" +-datadir="@datadir@" +- + result="" + + for d in $*; do + case $d in + --includes) +- result="$result @all_includes@ @aqdtaus_includes@" ++ result="$result $(pkg-config --cflags-only-i qt-mt) @aqdtaus_includes@" + ;; + --libraries) + result="$result @aqdtaus_libs@" +--- aqbanking-2.1.0/src/plugins/backends/aqhbci/aqhbci-config.in.in.foo 2006-09-05 11:12:24.000000000 -0400 ++++ aqbanking-2.1.0/src/plugins/backends/aqhbci/aqhbci-config.in.in 2006-09-05 11:13:59.000000000 -0400 +@@ -1,17 +1,12 @@ + # $Id: aqbanking-2.1.0-pkgconfig.patch,v 1.3 2006/09/05 15:15:21 notting Exp $ + # Author of this file: Martin Preuss + +-prefix="@prefix@" +-exec_prefix="@exec_prefix@" +-libdir="@libdir@" +-datadir="@datadir@" +- + result="" + + for d in $*; do + case $d in + --includes) +- result="$result @all_includes@ @aqhbci_includes@" ++ result="$result $(pkg-config --cflags-only-I qt-mt) @aqhbci_includes@" + ;; + --libraries) + result="$result @aqhbci_ldflags@ @aqhbci_libs@" diff --git a/aqbanking.spec b/aqbanking.spec index 351de86..177c627 100644 --- a/aqbanking.spec +++ b/aqbanking.spec @@ -1,7 +1,7 @@ Name: aqbanking Summary: A library for online banking functions and financial data import/export. Version: 2.1.0 -Release: 6 +Release: 7 Source: http://download.sourceforge.net/aqbanking/%{name}-%{version}.tar.gz Group: System Environment/Libraries License: GPL @@ -90,8 +90,8 @@ mv $RPM_BUILD_ROOT/%{_datadir}/doc/{aqbanking,aqhbci} $RPM_BUILD_ROOT/%{_datadir %changelog -* Fri Sep 1 2006 Bill Nottingham - 2.1.0-6 -- fix multilib conficts +* Fri Sep 1 2006 Bill Nottingham - 2.1.0-7 +- fix multilib conficts (#205204) * Mon Aug 28 2006 Bill Nottingham - 2.1.0-4 - rebuild against latest libofx