diff --git a/.gitignore b/.gitignore index b32ab50..d8b62f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -aqbanking-4.2.4.tar.gz +/aqbanking-5.3.2beta-patched.tar.gz diff --git a/aqbanking-2.1.0-conflict.patch b/aqbanking-2.1.0-conflict.patch deleted file mode 100644 index 9c54910..0000000 --- a/aqbanking-2.1.0-conflict.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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-3.7.2-pkgconfig.patch b/aqbanking-3.7.2-pkgconfig.patch deleted file mode 100644 index ed78935..0000000 --- a/aqbanking-3.7.2-pkgconfig.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -up aqbanking-3.7.2/aqbanking-config.in.in.pkgconfig aqbanking-3.7.2/aqbanking-config.in.in ---- aqbanking-3.7.2/aqbanking-config.in.in.pkgconfig 2008-07-31 14:13:31.000000000 -0400 -+++ aqbanking-3.7.2/aqbanking-config.in.in 2008-09-09 13:18:20.000000000 -0400 -@@ -1,50 +1,44 @@ - # $Id: aqbanking-3.7.2-pkgconfig.patch,v 1.1 2008/09/09 19:55:27 notting Exp $ - # Author of this file: Martin Preuss - --prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@ --datadir=@datadir@ -- - result="" - - 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 " - ;; - --plugins) -- result="$result @aqbanking_plugindir@" -+ result="$result $(pkg-config --variable=plugindir aqbanking)" - ;; - --data) -- result="$result @aqbanking_pkgdatadir@" -+ result="$result $(pkg-config --variable=pkgdatadir aqbanking)" - ;; - - --has-qbanking) - result=@with_qbanking@ - ;; - --qbanking-libraries) -- result="$result @aqbanking_ldflags@ @qbanking_libs@" -+ result="$result $(pkg-config --variable=qbanking_libs aqbanking)" - ;; - --qbanking-plugins) -- result="$result @qbanking_plugindir@" -+ result="$result $(pkg-config --variable=qbanking_plugindir aqbanking)" - ;; - --qbanking-helpdir) -- result="$result @qbanking_helpdir@" -+ result="$result $(pkg-config --variable=qbanking_helpdir aqbanking)" - ;; - - --has-aqhbci) - result=@with_aqhbci@ - ;; - --aqhbci-libraries) -- result="$result @aqbanking_ldflags@ @aqhbci_libs@" -+ result="$result $(pkg-config --variable=aqhbci_libs aqbanking)" - ;; - - --vmajor) -diff -up aqbanking-3.7.2/aqbanking.pc.in.pkgconfig aqbanking-3.7.2/aqbanking.pc.in ---- aqbanking-3.7.2/aqbanking.pc.in.pkgconfig 2008-09-09 13:16:24.000000000 -0400 -+++ aqbanking-3.7.2/aqbanking.pc.in 2008-09-09 13:18:22.000000000 -0400 -@@ -32,6 +32,8 @@ kbanking_datadir=@kbanking_data@ - qbanking_includes=@qbanking_includes@ - qbanking_libs=@qbanking_libs@ - qbanking_datadir=@qbanking_data@ -+qbanking_plugindir=@qbanking_plugindir@ -+qbanking_helpdir=@qbanking_helpdir@ - cbanking_includes=@cbanking_includes@ - cbanking_libs=@cbanking_libs@ - cbanking_datadir=@cbanking_data@ diff --git a/aqbanking-3.8.2-c++.patch b/aqbanking-3.8.2-c++.patch deleted file mode 100644 index 12da0f7..0000000 --- a/aqbanking-3.8.2-c++.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up aqbanking-3.8.2/src/plugins/backends/aqhbci/ui/qt3/libs/logmanager/error.cpp.foo aqbanking-3.8.2/src/plugins/backends/aqhbci/ui/qt3/libs/logmanager/error.cpp ---- aqbanking-3.8.2/src/plugins/backends/aqhbci/ui/qt3/libs/logmanager/error.cpp.foo 2009-03-05 15:45:22.000000000 -0500 -+++ aqbanking-3.8.2/src/plugins/backends/aqhbci/ui/qt3/libs/logmanager/error.cpp 2009-03-05 15:46:09.000000000 -0500 -@@ -32,6 +32,7 @@ - - #include "assert.h" - #include "error.h" -+#include - - namespace HBCI { - diff --git a/aqbanking-5.0.2-pkgconfig.patch b/aqbanking-5.0.2-pkgconfig.patch new file mode 100644 index 0000000..77ce4e3 --- /dev/null +++ b/aqbanking-5.0.2-pkgconfig.patch @@ -0,0 +1,60 @@ +diff -up aqbanking-5.0.2/aqbanking-config.in.in.foo aqbanking-5.0.2/aqbanking-config.in.in +--- aqbanking-5.0.2/aqbanking-config.in.in.foo 2011-02-11 16:46:23.610084051 -0500 ++++ aqbanking-5.0.2/aqbanking-config.in.in 2011-02-11 16:49:01.181084055 -0500 +@@ -1,51 +1,31 @@ + # $Id$ + # Author of this file: Martin Preuss + +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-libdir=@libdir@ +-datarootdir=@datarootdir@ +-includedir=@includedir@ +-datadir=@datadir@ +- + result="" + + 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 " + ;; + --plugins) +- result="$result @aqbanking_plugindir@" ++ result="$result $(pkg-config --variable=plugindir aqbanking)" + ;; + --data) +- result="$result @aqbanking_pkgdatadir@" +- ;; +- +- --has-qbanking) +- result=@with_qbanking@ +- ;; +- --qbanking-libraries) +- result="$result @aqbanking_ldflags@ @qbanking_libs@" +- ;; +- --qbanking-plugins) +- result="$result @qbanking_plugindir@" +- ;; +- --qbanking-helpdir) +- result="$result @qbanking_helpdir@" ++ result="$result $(pkg-config --variable=pkgdatadir aqbanking)" + ;; + + --has-aqhbci) + result=@with_aqhbci@ + ;; + --aqhbci-libraries) +- result="$result @aqbanking_ldflags@ @aqhbci_libs@" ++ result="$result $(pkg-config --variable=aqhbci_libs aqbanking)" + ;; + + --vmajor) diff --git a/aqbanking-5.3-conflict.patch b/aqbanking-5.3-conflict.patch new file mode 100644 index 0000000..db4492c --- /dev/null +++ b/aqbanking-5.3-conflict.patch @@ -0,0 +1,12 @@ +diff -up aqbanking-5.0.25/configure.conflict aqbanking-5.0.25/configure +--- aqbanking-5.0.25/configure.conflict 2012-08-03 16:38:39.000000000 -0400 ++++ aqbanking-5.0.25/configure 2013-04-24 11:15:23.327100393 -0400 +@@ -2821,7 +2821,7 @@ Q4BANKING_VERSION_STRING="$AQBANKING_VER + # + # datetime + # +-DATETIME="`date +\"%Y%m%d%H%M%S\"`" ++DATETIME="`date +\"%Y%m%d\"`" + + + diff --git a/aqbanking-aqebics.patch b/aqbanking-aqebics.patch new file mode 100644 index 0000000..7b95830 --- /dev/null +++ b/aqbanking-aqebics.patch @@ -0,0 +1,36 @@ +diff -up aqbanking-5.3.1beta/configure.foo aqbanking-5.3.1beta/configure +--- aqbanking-5.3.1beta/configure.foo 2014-01-15 19:43:32.000000000 -0500 ++++ aqbanking-5.3.1beta/configure 2014-01-15 19:47:47.155133410 -0500 +@@ -17593,7 +17593,7 @@ fi + + + if test "$aqbanking_backends" = "all"; then +- aqbanking_backends="aqhbci aqnone aqofxconnect aqebics" ++ aqbanking_backends="aqhbci aqnone aqofxconnect" + fi + + for f in ${aqbanking_backends}; do +@@ -19978,7 +19978,7 @@ esac + # Output files + # + +-ac_config_files="$ac_config_files mksymlinks.sh admin/Makefile doc/Makefile m4/Makefile src/Makefile src/libs/Makefile src/libs/aqbanking/Makefile src/libs/aqbanking/ressource.rc src/libs/aqbanking/jobs/Makefile src/libs/aqbanking/types/Makefile src/libs/aqbanking/gui/Makefile src/libs/aqbanking/dialogs/Makefile src/libs/aqbanking/typemaker2/Makefile src/libs/aqbanking/typemaker2/c/Makefile src/libs/aqbanking/backendsupport/Makefile src/libs/aqbankingpp/Makefile src/plugins/Makefile src/plugins/bankinfo/Makefile src/plugins/bankinfo/at/Makefile src/plugins/bankinfo/at/at.xml src/plugins/bankinfo/ca/Makefile src/plugins/bankinfo/ca/ca.xml src/plugins/bankinfo/ch/Makefile src/plugins/bankinfo/ch/ch.xml src/plugins/bankinfo/de/Makefile src/plugins/bankinfo/de/de.xml src/plugins/bankinfo/us/Makefile src/plugins/bankinfo/us/us.xml src/plugins/bankinfo/generic/Makefile src/plugins/imexporters/Makefile src/plugins/imexporters/dtaus/Makefile src/plugins/imexporters/dtaus/dtaus.xml src/plugins/imexporters/dtaus/ressource.rc src/plugins/imexporters/dtaus/profiles/Makefile src/plugins/imexporters/dtaus/profiles/default.conf src/plugins/imexporters/dtaus/profiles/debitnote.conf src/plugins/imexporters/dtaus/profiles/transfer.conf src/plugins/imexporters/eri2/Makefile src/plugins/imexporters/eri2/eri2.xml src/plugins/imexporters/eri2/ressource.rc src/plugins/imexporters/eri2/profiles/Makefile src/plugins/imexporters/eri2/profiles/default.conf src/plugins/imexporters/ofx/Makefile src/plugins/imexporters/ofx/ofx.xml src/plugins/imexporters/ofx/ressource.rc src/plugins/imexporters/ofx/parser/Makefile src/plugins/imexporters/ofx/profiles/Makefile src/plugins/imexporters/ofx/profiles/default.conf src/plugins/imexporters/ofx/profiles/iso8859.conf src/plugins/imexporters/swift/Makefile src/plugins/imexporters/swift/swift.xml src/plugins/imexporters/swift/ressource.rc src/plugins/imexporters/swift/profiles/Makefile src/plugins/imexporters/swift/profiles/swiftmt940.conf src/plugins/imexporters/swift/profiles/swiftmt942.conf src/plugins/imexporters/swift/profiles/amro940.conf src/plugins/imexporters/swift/profiles/amro942.conf src/plugins/imexporters/csv/Makefile src/plugins/imexporters/csv/csv.xml src/plugins/imexporters/csv/ressource.rc src/plugins/imexporters/csv/profiles/Makefile src/plugins/imexporters/csv/profiles/default.conf src/plugins/imexporters/csv/profiles/amex.conf src/plugins/imexporters/csv/profiles/aqmoney1.conf src/plugins/imexporters/csv/profiles/aqmoney2.conf src/plugins/imexporters/csv/profiles/comdirect.conf src/plugins/imexporters/csv/profiles/consors-tagesgeld.conf src/plugins/imexporters/csv/profiles/mijnpostbank.conf src/plugins/imexporters/csv/profiles/oko.conf src/plugins/imexporters/csv/profiles/spk-aachen.conf src/plugins/imexporters/csv/profiles/spk-steiermark.conf src/plugins/imexporters/csv/profiles/tonline-banking.conf src/plugins/imexporters/csv/profiles/test.conf src/plugins/imexporters/csv/profiles/vrnetworld.conf src/plugins/imexporters/csv/profiles/lbbberlin.conf src/plugins/imexporters/csv/profiles/bankaustria.conf src/plugins/imexporters/csv/profiles/psk.conf src/plugins/imexporters/csv/profiles/diba.conf src/plugins/imexporters/csv/profiles/dkb.conf src/plugins/imexporters/csv/profiles/dkb-cash.conf src/plugins/imexporters/csv/profiles/sparda.conf src/plugins/imexporters/csv/profiles/full.conf src/plugins/imexporters/csv/profiles/hypovereinsbank.conf src/plugins/imexporters/csv/profiles/postbankffm.conf src/plugins/imexporters/csv/profiles/cli-transfers.conf src/plugins/imexporters/csv/profiles/sns.conf src/plugins/imexporters/csv/profiles/transfers.conf src/plugins/imexporters/openhbci1/Makefile src/plugins/imexporters/openhbci1/openhbci1.xml src/plugins/imexporters/openhbci1/ressource.rc src/plugins/imexporters/openhbci1/profiles/Makefile src/plugins/imexporters/openhbci1/profiles/default.conf src/plugins/imexporters/qif/Makefile src/plugins/imexporters/qif/qif.xml src/plugins/imexporters/qif/ressource.rc src/plugins/imexporters/qif/profiles/Makefile src/plugins/imexporters/qif/profiles/default.conf src/plugins/imexporters/yellownet/Makefile src/plugins/imexporters/yellownet/yellownet.xml src/plugins/imexporters/yellownet/ressource.rc src/plugins/imexporters/yellownet/profiles/Makefile src/plugins/imexporters/yellownet/profiles/default.conf src/plugins/imexporters/xmldb/Makefile src/plugins/imexporters/xmldb/xmldb.xml src/plugins/imexporters/xmldb/ressource.rc src/plugins/imexporters/xmldb/profiles/Makefile src/plugins/imexporters/xmldb/profiles/default.conf src/plugins/imexporters/sepa/Makefile src/plugins/imexporters/sepa/sepa.xml src/plugins/imexporters/sepa/ressource.rc src/plugins/imexporters/sepa/profiles/Makefile src/plugins/imexporters/sepa/profiles/default.conf src/plugins/imexporters/sepa/profiles/ccm.conf src/plugins/imexporters/sepa/profiles/001_002_03.conf src/plugins/imexporters/sepa/profiles/008_001_01.conf src/plugins/imexporters/sepa/profiles/008_002_02.conf src/plugins/imexporters/sepa/profiles/008_003_02.conf src/plugins/imexporters/ctxfile/Makefile src/plugins/imexporters/ctxfile/ctxfile.xml src/plugins/imexporters/ctxfile/ressource.rc src/plugins/imexporters/ctxfile/profiles/Makefile src/plugins/imexporters/ctxfile/profiles/default.conf src/plugins/imexporters/q43/Makefile src/plugins/imexporters/q43/q43.xml src/plugins/imexporters/q43/profiles/Makefile src/plugins/imexporters/q43/profiles/default.conf src/plugins/parsers/Makefile src/plugins/parsers/dtaus/Makefile src/plugins/parsers/dtaus/dtaus.xml src/plugins/parsers/dtaus/ressource.rc src/plugins/parsers/swift/Makefile src/plugins/parsers/swift/swift.xml src/plugins/parsers/swift/ressource.rc src/plugins/backends/Makefile src/plugins/backends/aqhbci/Makefile src/plugins/backends/aqhbci/plugin/Makefile src/plugins/backends/aqhbci/plugin/aqhbci.xml src/plugins/backends/aqhbci/plugin/dialogs/Makefile src/plugins/backends/aqhbci/plugin/header.xml src/plugins/backends/aqhbci/plugin/ressource.rc src/plugins/backends/aqhbci/plugin/banking/Makefile src/plugins/backends/aqhbci/plugin/msglayer/Makefile src/plugins/backends/aqhbci/plugin/joblayer/Makefile src/plugins/backends/aqhbci/plugin/applayer/Makefile src/plugins/backends/aqhbci/plugin/accountjobs/Makefile src/plugins/backends/aqhbci/plugin/applayer/xml/Makefile src/plugins/backends/aqhbci/plugin/version.h src/plugins/backends/aqhbci/tools/Makefile src/plugins/backends/aqhbci/tools/hbcixml/Makefile src/plugins/backends/aqhbci/tools/aqhbci-tool/Makefile src/plugins/backends/aqofxconnect/Makefile src/plugins/backends/aqofxconnect/version.h src/plugins/backends/aqofxconnect/plugin/Makefile src/plugins/backends/aqofxconnect/plugin/aqofxconnect.xml src/plugins/backends/aqofxconnect/plugin/ressource.rc src/plugins/backends/aqofxconnect/plugin/libofxhome/Makefile src/plugins/backends/aqnone/Makefile src/plugins/backends/aqnone/aqnone.xml src/plugins/backends/aqnone/ressource.rc src/plugins/backends/aqebics/Makefile src/plugins/backends/aqebics/plugin/Makefile src/plugins/backends/aqebics/plugin/aqebics.xml src/plugins/backends/aqebics/plugin/client/Makefile src/plugins/backends/aqebics/plugin/dialogs/Makefile src/plugins/backends/aqebics/plugin/msg/Makefile src/plugins/backends/aqebics/tools/Makefile src/plugins/backends/aqebics/tools/aqebics-tool/Makefile src/test/Makefile src/tools/Makefile src/tools/aqbanking-cli/Makefile tutorials/Makefile po/Makefile Doxyfile Makefile aqbanking-config.in aqbanking.pc aqbanking.spec aqbanking.iss version.h system.h" ++ac_config_files="$ac_config_files mksymlinks.sh admin/Makefile doc/Makefile m4/Makefile src/Makefile src/libs/Makefile src/libs/aqbanking/Makefile src/libs/aqbanking/ressource.rc src/libs/aqbanking/jobs/Makefile src/libs/aqbanking/types/Makefile src/libs/aqbanking/gui/Makefile src/libs/aqbanking/dialogs/Makefile src/libs/aqbanking/typemaker2/Makefile src/libs/aqbanking/typemaker2/c/Makefile src/libs/aqbanking/backendsupport/Makefile src/libs/aqbankingpp/Makefile src/plugins/Makefile src/plugins/bankinfo/Makefile src/plugins/bankinfo/at/Makefile src/plugins/bankinfo/at/at.xml src/plugins/bankinfo/ca/Makefile src/plugins/bankinfo/ca/ca.xml src/plugins/bankinfo/ch/Makefile src/plugins/bankinfo/ch/ch.xml src/plugins/bankinfo/de/Makefile src/plugins/bankinfo/de/de.xml src/plugins/bankinfo/us/Makefile src/plugins/bankinfo/us/us.xml src/plugins/bankinfo/generic/Makefile src/plugins/imexporters/Makefile src/plugins/imexporters/dtaus/Makefile src/plugins/imexporters/dtaus/dtaus.xml src/plugins/imexporters/dtaus/ressource.rc src/plugins/imexporters/dtaus/profiles/Makefile src/plugins/imexporters/dtaus/profiles/default.conf src/plugins/imexporters/dtaus/profiles/debitnote.conf src/plugins/imexporters/dtaus/profiles/transfer.conf src/plugins/imexporters/eri2/Makefile src/plugins/imexporters/eri2/eri2.xml src/plugins/imexporters/eri2/ressource.rc src/plugins/imexporters/eri2/profiles/Makefile src/plugins/imexporters/eri2/profiles/default.conf src/plugins/imexporters/ofx/Makefile src/plugins/imexporters/ofx/ofx.xml src/plugins/imexporters/ofx/ressource.rc src/plugins/imexporters/ofx/parser/Makefile src/plugins/imexporters/ofx/profiles/Makefile src/plugins/imexporters/ofx/profiles/default.conf src/plugins/imexporters/ofx/profiles/iso8859.conf src/plugins/imexporters/swift/Makefile src/plugins/imexporters/swift/swift.xml src/plugins/imexporters/swift/ressource.rc src/plugins/imexporters/swift/profiles/Makefile src/plugins/imexporters/swift/profiles/swiftmt940.conf src/plugins/imexporters/swift/profiles/swiftmt942.conf src/plugins/imexporters/swift/profiles/amro940.conf src/plugins/imexporters/swift/profiles/amro942.conf src/plugins/imexporters/csv/Makefile src/plugins/imexporters/csv/csv.xml src/plugins/imexporters/csv/ressource.rc src/plugins/imexporters/csv/profiles/Makefile src/plugins/imexporters/csv/profiles/default.conf src/plugins/imexporters/csv/profiles/amex.conf src/plugins/imexporters/csv/profiles/aqmoney1.conf src/plugins/imexporters/csv/profiles/aqmoney2.conf src/plugins/imexporters/csv/profiles/comdirect.conf src/plugins/imexporters/csv/profiles/consors-tagesgeld.conf src/plugins/imexporters/csv/profiles/mijnpostbank.conf src/plugins/imexporters/csv/profiles/oko.conf src/plugins/imexporters/csv/profiles/spk-aachen.conf src/plugins/imexporters/csv/profiles/spk-steiermark.conf src/plugins/imexporters/csv/profiles/tonline-banking.conf src/plugins/imexporters/csv/profiles/test.conf src/plugins/imexporters/csv/profiles/vrnetworld.conf src/plugins/imexporters/csv/profiles/lbbberlin.conf src/plugins/imexporters/csv/profiles/bankaustria.conf src/plugins/imexporters/csv/profiles/psk.conf src/plugins/imexporters/csv/profiles/diba.conf src/plugins/imexporters/csv/profiles/dkb.conf src/plugins/imexporters/csv/profiles/dkb-cash.conf src/plugins/imexporters/csv/profiles/sparda.conf src/plugins/imexporters/csv/profiles/full.conf src/plugins/imexporters/csv/profiles/hypovereinsbank.conf src/plugins/imexporters/csv/profiles/postbankffm.conf src/plugins/imexporters/csv/profiles/cli-transfers.conf src/plugins/imexporters/csv/profiles/sns.conf src/plugins/imexporters/csv/profiles/transfers.conf src/plugins/imexporters/openhbci1/Makefile src/plugins/imexporters/openhbci1/openhbci1.xml src/plugins/imexporters/openhbci1/ressource.rc src/plugins/imexporters/openhbci1/profiles/Makefile src/plugins/imexporters/openhbci1/profiles/default.conf src/plugins/imexporters/qif/Makefile src/plugins/imexporters/qif/qif.xml src/plugins/imexporters/qif/ressource.rc src/plugins/imexporters/qif/profiles/Makefile src/plugins/imexporters/qif/profiles/default.conf src/plugins/imexporters/yellownet/Makefile src/plugins/imexporters/yellownet/yellownet.xml src/plugins/imexporters/yellownet/ressource.rc src/plugins/imexporters/yellownet/profiles/Makefile src/plugins/imexporters/yellownet/profiles/default.conf src/plugins/imexporters/xmldb/Makefile src/plugins/imexporters/xmldb/xmldb.xml src/plugins/imexporters/xmldb/ressource.rc src/plugins/imexporters/xmldb/profiles/Makefile src/plugins/imexporters/xmldb/profiles/default.conf src/plugins/imexporters/sepa/Makefile src/plugins/imexporters/sepa/sepa.xml src/plugins/imexporters/sepa/ressource.rc src/plugins/imexporters/sepa/profiles/Makefile src/plugins/imexporters/sepa/profiles/default.conf src/plugins/imexporters/sepa/profiles/ccm.conf src/plugins/imexporters/sepa/profiles/001_002_03.conf src/plugins/imexporters/sepa/profiles/008_001_01.conf src/plugins/imexporters/sepa/profiles/008_002_02.conf src/plugins/imexporters/sepa/profiles/008_003_02.conf src/plugins/imexporters/ctxfile/Makefile src/plugins/imexporters/ctxfile/ctxfile.xml src/plugins/imexporters/ctxfile/ressource.rc src/plugins/imexporters/ctxfile/profiles/Makefile src/plugins/imexporters/ctxfile/profiles/default.conf src/plugins/imexporters/q43/Makefile src/plugins/imexporters/q43/q43.xml src/plugins/imexporters/q43/profiles/Makefile src/plugins/imexporters/q43/profiles/default.conf src/plugins/parsers/Makefile src/plugins/parsers/dtaus/Makefile src/plugins/parsers/dtaus/dtaus.xml src/plugins/parsers/dtaus/ressource.rc src/plugins/parsers/swift/Makefile src/plugins/parsers/swift/swift.xml src/plugins/parsers/swift/ressource.rc src/plugins/backends/Makefile src/plugins/backends/aqhbci/Makefile src/plugins/backends/aqhbci/plugin/Makefile src/plugins/backends/aqhbci/plugin/aqhbci.xml src/plugins/backends/aqhbci/plugin/dialogs/Makefile src/plugins/backends/aqhbci/plugin/header.xml src/plugins/backends/aqhbci/plugin/ressource.rc src/plugins/backends/aqhbci/plugin/banking/Makefile src/plugins/backends/aqhbci/plugin/msglayer/Makefile src/plugins/backends/aqhbci/plugin/joblayer/Makefile src/plugins/backends/aqhbci/plugin/applayer/Makefile src/plugins/backends/aqhbci/plugin/accountjobs/Makefile src/plugins/backends/aqhbci/plugin/applayer/xml/Makefile src/plugins/backends/aqhbci/plugin/version.h src/plugins/backends/aqhbci/tools/Makefile src/plugins/backends/aqhbci/tools/hbcixml/Makefile src/plugins/backends/aqhbci/tools/aqhbci-tool/Makefile src/plugins/backends/aqofxconnect/Makefile src/plugins/backends/aqofxconnect/version.h src/plugins/backends/aqofxconnect/plugin/Makefile src/plugins/backends/aqofxconnect/plugin/aqofxconnect.xml src/plugins/backends/aqofxconnect/plugin/ressource.rc src/plugins/backends/aqofxconnect/plugin/libofxhome/Makefile src/plugins/backends/aqnone/Makefile src/plugins/backends/aqnone/aqnone.xml src/plugins/backends/aqnone/ressource.rc src/test/Makefile src/tools/Makefile src/tools/aqbanking-cli/Makefile tutorials/Makefile po/Makefile Doxyfile Makefile aqbanking-config.in aqbanking.pc aqbanking.spec aqbanking.iss version.h system.h" + + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure +@@ -21350,14 +21350,6 @@ do + "src/plugins/backends/aqnone/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/backends/aqnone/Makefile" ;; + "src/plugins/backends/aqnone/aqnone.xml") CONFIG_FILES="$CONFIG_FILES src/plugins/backends/aqnone/aqnone.xml" ;; + "src/plugins/backends/aqnone/ressource.rc") CONFIG_FILES="$CONFIG_FILES src/plugins/backends/aqnone/ressource.rc" ;; +- "src/plugins/backends/aqebics/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/backends/aqebics/Makefile" ;; +- "src/plugins/backends/aqebics/plugin/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/backends/aqebics/plugin/Makefile" ;; +- "src/plugins/backends/aqebics/plugin/aqebics.xml") CONFIG_FILES="$CONFIG_FILES src/plugins/backends/aqebics/plugin/aqebics.xml" ;; +- "src/plugins/backends/aqebics/plugin/client/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/backends/aqebics/plugin/client/Makefile" ;; +- "src/plugins/backends/aqebics/plugin/dialogs/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/backends/aqebics/plugin/dialogs/Makefile" ;; +- "src/plugins/backends/aqebics/plugin/msg/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/backends/aqebics/plugin/msg/Makefile" ;; +- "src/plugins/backends/aqebics/tools/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/backends/aqebics/tools/Makefile" ;; +- "src/plugins/backends/aqebics/tools/aqebics-tool/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/backends/aqebics/tools/aqebics-tool/Makefile" ;; + "src/test/Makefile") CONFIG_FILES="$CONFIG_FILES src/test/Makefile" ;; + "src/tools/Makefile") CONFIG_FILES="$CONFIG_FILES src/tools/Makefile" ;; + "src/tools/aqbanking-cli/Makefile") CONFIG_FILES="$CONFIG_FILES src/tools/aqbanking-cli/Makefile" ;; diff --git a/aqbanking-arch.patch b/aqbanking-arch.patch new file mode 100644 index 0000000..a1bf30d --- /dev/null +++ b/aqbanking-arch.patch @@ -0,0 +1,48 @@ +diff -up aqbanking-5.0.22/configure.conflict aqbanking-5.0.22/configure +--- aqbanking-5.0.22/configure.conflict 2012-01-09 13:45:45.000000000 -0500 ++++ aqbanking-5.0.22/configure 2012-01-19 09:46:17.252162096 -0500 +@@ -11978,7 +11978,7 @@ BEGIN {RS=" "; FS="/|\n";} { + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` + else +- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++ sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib" + fi + library_names_spec= + libname_spec='lib$name' +@@ -11992,7 +11992,7 @@ shlibpath_var= + shlibpath_overrides_runpath=unknown + version_type=none + dynamic_linker="$host_os ld.so" +-sys_lib_dlsearch_path_spec="/lib /usr/lib" ++sys_lib_dlsearch_path_spec="/lib64 /usr/lib64" + need_lib_prefix=unknown + hardcode_into_libs=no + +@@ -12450,7 +12450,7 @@ fi + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -15843,7 +15843,7 @@ shlibpath_var= + shlibpath_overrides_runpath=unknown + version_type=none + dynamic_linker="$host_os ld.so" +-sys_lib_dlsearch_path_spec="/lib /usr/lib" ++sys_lib_dlsearch_path_spec="/lib64 /usr/lib64" + need_lib_prefix=unknown + hardcode_into_libs=no + +@@ -16299,7 +16299,7 @@ fi + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on diff --git a/aqbanking.spec b/aqbanking.spec index fd21296..91439b4 100644 --- a/aqbanking.spec +++ b/aqbanking.spec @@ -1,28 +1,32 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%define qt3pkg qt -%if 0%{?fedora} > 8 || 0%{?rhel} > 5 -%define qt3pkg qt3 -%endif +%define ver %{version}beta Name: aqbanking Summary: A library for online banking functions and financial data import/export -Version: 4.2.4 -Release: 4%{?dist} +Version: 5.3.2 +Release: 0.1.beta%{?dist} # Download is PHP form at http://www.aquamaniac.de/sites/download/packages.php -Source: %{name}-%{version}.tar.gz +# aqbanking contains nonfree code that we cannot ship. Therefore we use +# this script to remove the nonfree code before shipping it. +# Download the upstream tarball and invoke this script while in the +# tarball's directory: +# ./generate-tarball.sh 1.0 +Source: %{name}-%{ver}-patched.tar.gz Group: System Environment/Libraries -License: GPLv2+ +License: GPLv2 or GPLv3 URL: http://www.aquamaniac.de/aqbanking/ -Patch2: aqbanking-3.7.2-pkgconfig.patch -Patch3: aqbanking-2.1.0-conflict.patch +Patch2: aqbanking-5.0.2-pkgconfig.patch +Patch3: aqbanking-5.3-conflict.patch +Patch4: aqbanking-arch.patch +Patch5: aqbanking-aqebics.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# qbanking -BuildRequires: %{qt3pkg}-devel -BuildRequires: qt4-devel -BuildRequires: gwenhywfar-devel >= 3.10.0, gmp-devel, gettext, libtool +BuildRequires: gwenhywfar-devel >= 4.0.0, gmp-devel, gettext, libtool +#BuildRequires: xmlsec1-gnutls-devel, libxslt-devel, libxml2-devel Obsoletes: aqhbci <= 1.0.3 Obsoletes: g2banking < 3.7.2-1 +Obsoletes: qbanking < 5.0 +Obsoletes: q4banking < 5.0 Obsoletes: python-aqbanking %description @@ -45,75 +49,40 @@ Requires: pkgconfig Requires: automake Obsoletes: aqhbci-devel <= 1.0.3 Obsoletes: g2banking-devel < 3.7.2-1 +Obsoletes: qbanking-devel < 5.0 +Obsoletes: q4banking-devel < 5.0 %description devel This package contains aqbanking-config and header files for writing and compiling programs using Aqbanking. -%package -n qbanking -Summary: Qt3 bindings for Aqbanking -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} -Obsoletes: aqhbci-qt-tools <= 1.0.3 -Obsoletes: kbanking < 3.7.2-1 - -%description -n qbanking -This package contains the qbanking KDE bindings for the Aqbanking -online banking library. - -%package -n qbanking-devel -Summary: Development headers for qbanking -Group: Development/Libraries -Requires: %{name}-devel = %{version}-%{release} -Requires: qbanking = %{version}-%{release} -Requires: %{qt3pkg}-devel -Obsoletes: kbanking-devel < 3.7.2-1 - -%description -n qbanking-devel -This package contains qbanking-config and header files for writing and -compiling programs using the qbanking bindings for Aqbanking. - -%package -n q4banking -Summary: Qt4 bindings for Aqbanking -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} -%{?_qt4_version:Requires:qt4 >= %{_qt4_version}} -%description -n q4banking -%{summary}. - -%package -n q4banking-devel -Summary: Development files for q4banking -Group: Development/Libraries -Requires: %{name}-devel = %{version}-%{release} -Requires: q4banking = %{version}-%{release} -Requires: qt4-devel -%description -n q4banking-devel -%{summary}. - - %prep -%setup -q +%setup -q -n %{name}-%{ver} %patch2 -p1 -b .pkgconfig %patch3 -p1 -b .conflict +%patch5 -p1 -b .aqebics + +# hack to nuke rpaths, slighly less ugly than using overriding LIBTOOL below +%if "%{_libdir}" != "/usr/lib" +%patch4 -p1 -b .arch +sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure +%endif %build -[ -z "$QTDIR" ] && . /etc/profile.d/qt.sh %configure \ - --disable-static \ - --with-frontends="qbanking q4banking" \ - --enable-qt4 \ - --with-qt4-includes=%{_qt4_headerdir} \ - --with-qt4-libs=%{_qt4_libdir} \ - --with-qt4-moc=moc-qt4 \ - --with-qt4-uic=uic-qt4 + --disable-static -make LIBTOOL=/usr/bin/libtool +# not smp_mflags safe +# override LIBTOOL to quash rpath +make +#LIBTOOL=/usr/bin/libtool %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool install +make install DESTDIR=$RPM_BUILD_ROOT +# LIBTOOL=/usr/bin/libtool find $RPM_BUILD_ROOT -name *.la -exec rm -f {} \; find $RPM_BUILD_ROOT -name *.a -exec rm -f {} \; @@ -124,13 +93,14 @@ rm -rf .deps rm -f Makefile* cd .. -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version} -mv $RPM_BUILD_ROOT/%{_datadir}/doc/{aqbanking,aqhbci} $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version} -mv AUTHORS README COPYING ChangeLog NEWS $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version} +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/%{name} +mv $RPM_BUILD_ROOT/%{_datadir}/doc/aqhbci $RPM_BUILD_ROOT/%{_datadir}/doc/%{name} +mv AUTHORS README COPYING ChangeLog NEWS $RPM_BUILD_ROOT/%{_datadir}/doc/%{name} %find_lang %{name} -# Fix multilib errors. (#602879) -sed -i 's|** Created:.*|** Created |g' $RPM_BUILD_ROOT/%{_includedir}/q4banking/*.ui.h +%check +## meh, requires X server +make check ||: %clean rm -rf $RPM_BUILD_ROOT @@ -139,33 +109,22 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig -%post -n qbanking -p /sbin/ldconfig - -%postun -n qbanking -p /sbin/ldconfig - -%post -n q4banking -p /sbin/ldconfig - -%postun -n q4banking -p /sbin/ldconfig - - %files -f %{name}.lang %defattr(-,root,root) -%doc %{_datadir}/doc/%{name}-%{version} +%doc %{_datadir}/doc/%{name} %{_libdir}/libaq*.so.* %dir %{_libdir}/aqbanking %dir %{_libdir}/aqbanking/plugins/ -%dir %{_libdir}/aqbanking/plugins/*/ -%dir %{_libdir}/aqbanking/plugins/*/debugger/ -%dir %{_libdir}/aqbanking/plugins/*/debugger/*/ -%dir %{_libdir}/aqbanking/plugins/*/frontends/ -%{_libdir}/aqbanking/plugins/*/bankinfo/ -%{_libdir}/aqbanking/plugins/*/imexporters/ -%{_libdir}/aqbanking/plugins/*/providers/ +%dir %{_libdir}/aqbanking/plugins/* +%{_libdir}/aqbanking/plugins/*/bankinfo +%{_libdir}/aqbanking/plugins/*/imexporters +%{_libdir}/aqbanking/plugins/*/providers %{_libdir}/gwenhywfar/plugins/*/dbio/* %dir %{_datadir}/aqbanking -%dir %{_datadir}/aqbanking/frontends +%dir %{_datadir}/aqbanking/aqbanking %{_datadir}/aqbanking/backends/ %{_datadir}/aqbanking/bankinfo/ +%{_datadir}/aqbanking/dialogs/ %{_datadir}/aqbanking/imexporters/ %{_bindir}/aqbanking-cli %{_bindir}/aqhbci-tool4 @@ -179,40 +138,71 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/aq*/ %{_libdir}/pkgconfig/aqbanking.pc %{_datadir}/aclocal/aqbanking.m4 +%{_datadir}/aqbanking/aqbanking/typemaker2 +%{_datadir}/aqbanking/typemaker2 -%files -n qbanking -%defattr(-,root,root) -%{_bindir}/qb-help8 -%{_libdir}/libqbanking.so.* -%{_libdir}/aqbanking/plugins/*/debugger/aqhbci/aqhbci-qt3-debug -%{_libdir}/aqbanking/plugins/*/debugger/aqhbci/qt_debug.xml -%{_libdir}/aqbanking/plugins/*/frontends/qbanking -%{_libdir}/aqbanking/plugins/*/wizards/qt3* -%{_datadir}/aqbanking/i18n -%{_datadir}/aqbanking/frontends/qbanking/ - -%files -n qbanking-devel -%defattr(-,root,root) -%{_includedir}/qbanking/ -%{_libdir}/libqbanking.so +%changelog +* Fri Jan 17 2014 Bill Nottingham - 5.3.2beta-0.2 +- bump to 5.3.2beta -%files -n q4banking -%defattr(-,root,root) -%{_bindir}/q4b-help1 -%{_libdir}/aqbanking/plugins/*/debugger/aqhbci/aqhbci-qt4-debug -%{_libdir}/aqbanking/plugins/*/debugger/aqhbci/qt4_debug.xml -%{_libdir}/aqbanking/plugins/*/frontends/q4banking -%{_libdir}/aqbanking/plugins/*/wizards/qt4* -%{_datadir}/aqbanking/frontends/q4banking/ -%{_libdir}/libq4banking.so.1* - -%files -n q4banking-devel -%defattr(-,root,root) -%{_includedir}/q4banking/ -%{_libdir}/libq4banking.so +* Wed Jan 15 2014 Bill Nottingham - 5.3.1beta-0.1 +- update to latest upstream +- disable aqebics for now +* Thu Dec 12 2013 Bill Nottingham - 5.0.25-4 +- add upstream patches for OFXDirectConnect (#1040224) + +* Tue Aug 06 2013 Bill Nottingham - 5.0.25-3 +- Fix for UnversionedDocDirs feature (#993669) + +* Sat Aug 03 2013 Fedora Release Engineering - 5.0.25-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Apr 24 2013 Bill Nottingham - 5.0.25-1 +- update to 5.0.25 + +* Wed Feb 13 2013 Fedora Release Engineering - 5.0.22-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jul 18 2012 Fedora Release Engineering - 5.0.22-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jan 19 2012 Bill Nottingham - 5.0.22-2 +- update to 5.0.22 +- fix up rpaths a little cleaner + +* Thu Jan 12 2012 Fedora Release Engineering - 5.0.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Oct 25 2011 Bill Nottingham - 5.0.16-1 +- update to 5.0.16 + +* Thu Oct 20 2011 Marcela Mašláňová - 5.0.2-3.2 +- rebuild with new gmp without compat lib + +* Mon Oct 10 2011 Peter Schiffer - 5.0.2-3.1 +- rebuild with new gmp + +* Mon Feb 21 2011 Bill Nottingham - 5.0.2-3 +- fix -devel obsoletes + +* Wed Feb 16 2011 Bill Nottingham - 5.0.2-2 +- remove aqpaypal source + +* Fri Feb 11 2011 Bill Nottingham - 5.0.2-1 +- update to latest upstream release + +* Mon Feb 07 2011 Fedora Release Engineering - 4.2.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sun Aug 22 2010 Rex Dieter - 4.2.4-6 +- q4banking: try harder to purge qt3 dep (#626008) + +* Sun Aug 22 2010 Rex Dieter - 4.2.4-5 +- rebase pkgconfig patch +- q4banking should not depend on qt3 (#626008) +- include %%check section, though currently mostly useless -%changelog * Fri Jun 25 2010 Bill Nottingham - 4.2.4-4 - fix multilib errors (#602879) diff --git a/generate-tarball.sh b/generate-tarball.sh new file mode 100755 index 0000000..3f95f30 --- /dev/null +++ b/generate-tarball.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +VERSION=$1 + +tar -xzvf aqbanking-$VERSION.tar.gz +rm -rf aqbanking-$VERSION/src/plugins/backends/aqpaypal +sed -i -e 's/ aqpaypal / /' aqbanking-$VERSION/src/plugins/backends/Makefile.in +rm -rf aqbanking-$VERSION/src/plugins/backends/aqebics +sed -i -e 's/ aqebics / /' aqbanking-$VERSION/src/plugins/backends/Makefile.in + +tar -czvf aqbanking-$VERSION-patched.tar.gz aqbanking-$VERSION \ No newline at end of file diff --git a/sources b/sources index 0bc469e..1b0e541 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -244f5c6e470b55452d9f2cb6c081c137 aqbanking-4.2.4.tar.gz +a6682a980457a8c4f57504821f21dab4 aqbanking-5.3.2beta-patched.tar.gz