[aqbanking] Add the patch.
Bill Nottingham
notting at fedoraproject.org
Thu Jan 19 15:33:13 UTC 2012
commit a263e932dcf44e04c348d0f12525e19a4cb7120f
Author: Bill Nottingham <notting at redhat.com>
Date: Thu Jan 19 10:32:41 2012 -0500
Add the patch.
aqbanking-5.0.22-conflict.patch | 78 +++++++++++++++++++++++++++++++++++++++
1 files changed, 78 insertions(+), 0 deletions(-)
---
diff --git a/aqbanking-5.0.22-conflict.patch b/aqbanking-5.0.22-conflict.patch
new file mode 100644
index 0000000..09cdb5c
--- /dev/null
+++ b/aqbanking-5.0.22-conflict.patch
@@ -0,0 +1,78 @@
+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
+@@ -2821,7 +2821,7 @@ Q4BANKING_VERSION_STRING="$AQBANKING_VER
+ #
+ # datetime
+ #
+-DATETIME="`date +\"%Y%m%d%H%M%S\"`"
++DATETIME="`date +\"%Y%m%d\"`"
+
+
+
+@@ -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
+@@ -19764,7 +19764,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/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/plu
gins/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/ctxfile/Makefile src/plugins/imexporters/ctxfile/ctxfile.xml src/plugins/imexporters/ctxfile/ressource.rc src/plugins/imexporters/ctxfile/profile
s/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/M
akefile 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/aqpaypal/Makefile src/plugins/backends/aqpaypal/plugin/Makefile src/plugins/backends/aqpaypal/plugin/aqpaypal.xml src/plugins/backends/aqpaypal/tools/Makefile src/plugins/backends/aqpaypal/tools/aqpaypal-tool/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"
++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/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/plu
gins/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/ctxfile/Makefile src/plugins/imexporters/ctxfile/ctxfile.xml src/plugins/imexporters/ctxfile/ressource.rc src/plugins/imexporters/ctxfile/profile
s/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/M
akefile 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
+@@ -21144,11 +21144,6 @@ do
+ "src/plugins/backends/aqofxconnect/plugin/aqofxconnect.xml") CONFIG_FILES="$CONFIG_FILES src/plugins/backends/aqofxconnect/plugin/aqofxconnect.xml" ;;
+ "src/plugins/backends/aqofxconnect/plugin/ressource.rc") CONFIG_FILES="$CONFIG_FILES src/plugins/backends/aqofxconnect/plugin/ressource.rc" ;;
+ "src/plugins/backends/aqofxconnect/plugin/libofxhome/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/backends/aqofxconnect/plugin/libofxhome/Makefile" ;;
+- "src/plugins/backends/aqpaypal/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/backends/aqpaypal/Makefile" ;;
+- "src/plugins/backends/aqpaypal/plugin/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/backends/aqpaypal/plugin/Makefile" ;;
+- "src/plugins/backends/aqpaypal/plugin/aqpaypal.xml") CONFIG_FILES="$CONFIG_FILES src/plugins/backends/aqpaypal/plugin/aqpaypal.xml" ;;
+- "src/plugins/backends/aqpaypal/tools/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/backends/aqpaypal/tools/Makefile" ;;
+- "src/plugins/backends/aqpaypal/tools/aqpaypal-tool/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/backends/aqpaypal/tools/aqpaypal-tool/Makefile" ;;
+ "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" ;;
More information about the scm-commits
mailing list