upgrading package: aqbanking 1.6.1 -> 1.9.3

aqbanking/aqbanking.patch

@@ -1,7 +1,7 @@
-Index: src/libs/aqbanking/Makefile.in
---- src/libs/aqbanking/Makefile.in.orig	2005-11-04 20:18:55 +0100
-+++ src/libs/aqbanking/Makefile.in	2005-11-04 20:20:15 +0100
-@@ -515,7 +515,7 @@
+Index: aqbanking-1.9.3beta/src/libs/aqbanking/Makefile.in
+--- aqbanking-1.9.3beta/src/libs/aqbanking/Makefile.in.orig	2006-01-26 13:42:50 +0100
++++ aqbanking-1.9.3beta/src/libs/aqbanking/Makefile.in	2006-01-27 22:35:11 +0100
+@@ -528,7 +528,7 @@
   wcb.c\
   msgengine.c
  
@@ -10,10 +10,19 @@ Index: src/libs/aqbanking/Makefile.in
   jobs/libjobs.la \
   types/libtypes.la
  
-Index: src/plugins/bankinfo/generic/Makefile.in
---- src/plugins/bankinfo/generic/Makefile.in.orig	2005-11-04 20:18:55 +0100
-+++ src/plugins/bankinfo/generic/Makefile.in	2005-11-04 20:20:43 +0100
-@@ -467,7 +467,7 @@
+@@ -540,7 +540,7 @@
+ libaqbanking_la_DEPENDENCIES = jobs/libjobs.la types/libtypes.la \
+ 	$(am__append_1)
+ testlib_SOURCES = testlib.c
+-testlib_LDADD = libaqbanking.la
++testlib_LDADD = libaqbanking.la $(gwenhywfar_libs)
+ all: all-recursive
+ 
+ .SUFFIXES:
+Index: aqbanking-1.9.3beta/src/plugins/bankinfo/generic/Makefile.in
+--- aqbanking-1.9.3beta/src/plugins/bankinfo/generic/Makefile.in.orig	2006-01-26 13:43:10 +0100
++++ aqbanking-1.9.3beta/src/plugins/bankinfo/generic/Makefile.in	2006-01-27 08:29:31 +0100
+@@ -479,7 +479,7 @@
  libbankinfo_la_SOURCES = \
   generic.c
  
@@ -22,3 +31,15 @@ Index: src/plugins/bankinfo/generic/Makefile.in
  libbankinfo_la_LDFLAGS = $(STRIPALL)
  at_files = at/blz.idx at/bic.idx at/namloc.idx at/banks.data
  ch_files = ch/blz.idx ch/bic.idx ch/namloc.idx ch/banks.data
+Index: openhbci2-1.9.4/src/tools/hbcixml/Makefile.in
+--- openhbci2-1.9.4/src/tools/hbcixml/Makefile.in.orig	2006-01-20 12:09:55 +0100
++++ openhbci2-1.9.4/src/tools/hbcixml/Makefile.in	2006-01-27 08:29:31 +0100
+@@ -218,7 +218,7 @@
+ INCLUDES = -I../../../ -I../../../openhbci2 @PROGRAM_INCLUDES@ -I../../plugins/msg-xml
+ noinst_HEADERS = loganalyzer.h
+ hbcixml_SOURCES = hbcixml.cpp loganalyzer.cpp
+-hbcixml_LDADD = -L../../openhbci-tng -L../../openhbci-tng/openhbci-core @PROGRAM_LIBS@ ../../plugins/msg-xml/libmsgxml.la
++hbcixml_LDADD = -L../../openhbci-tng -L../../openhbci-tng/openhbci-core @PROGRAM_LIBS@ ../../plugins/msg-xml/libmsgxml.la $(gwenhywfar_libs)
+ all: all-am
+ 
+ .SUFFIXES:

aqbanking/aqbanking.spec

@@ -23,9 +23,10 @@
 ##
 
 #   package version
-%define       V_aqbanking   1.6.1
-%define       V_gwenhywfar  1.19.1
-%define       V_openhbci2   1.9.3
+%define       V_openpkg     1.9.3
+%define       V_aqbanking   1.9.3beta
+%define       V_gwenhywfar  1.99.5
+%define       V_openhbci2   1.9.4
 %define       V_openhbci1   0.9.18
 
 #   package information
@@ -38,8 +39,8 @@ Distribution: OpenPKG
 Class:        EVAL
 Group:        Finance
 License:      GPL
-Version:      %{V_aqbanking}
-Release:      20051114
+Version:      %{V_openpkg}
+Release:      20060127
 
 #   list of sources
 Source0:      http://osdn.dl.sourceforge.net/aqbanking/aqbanking-%{V_aqbanking}.tar.gz
@@ -67,7 +68,7 @@ AutoReqProv:  no
     prog aqbanking = {
         version   = %{V_aqbanking}
         url       = http://prdownloads.sourceforge.net/aqbanking/
-        regex     = aqbanking-(\d+(\.\d+)+)\.tar\.gz
+        regex     = aqbanking-(\d+(\.\d+)+(?:beta)?)\.tar\.gz
     }
     prog aqbanking:gwenhywfar = {
         version   = %{V_gwenhywfar}
@@ -90,9 +91,36 @@ AutoReqProv:  no
     %setup -q -D -T -a 1
     %setup -q -D -T -a 2
     %setup -q -D -T -a 3
-    %patch -p0 -d aqbanking-%{V_aqbanking}
+    %patch -p0
 
 %build
+    #   build Gwhenhywfar
+    ( cd gwenhywfar-%{V_gwenhywfar}
+      %{l_shtool} subst \
+          -e 's;rm -Rf gwenhywfar;#;' \
+          configure
+      CC="%{l_cc}" \
+      CFLAGS="%{l_cflags -O}" \
+      CPPFLAGS="-I`pwd`/gwenhywfar %{l_cppflags}" \
+      LDFLAGS="-L`pwd`/src %{l_ldflags}" \
+      ./configure \
+          --prefix=%{l_prefix} \
+          --enable-ssl \
+          --with-openssl-includes=%{l_prefix}/include \
+          --with-openssl-libs=%{l_prefix}/lib \
+          --disable-nls \
+          --disable-shared
+
+      #   build the library
+      %{l_make} %{l_mflags}
+
+      #   pre-install it and adjust for temporary usage by AqBanking build (below)
+      %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+      %{l_shtool} subst \
+          -e "s;%{l_prefix};$RPM_BUILD_ROOT%{l_prefix};g" \
+          $RPM_BUILD_ROOT%{l_prefix}/bin/gwenhywfar-config
+    ) || exit $?
+
     #   build OpenHBCI v1 (legacy)
     ( cd openhbci-%{V_openhbci1}
       CC="%{l_prefix}/bin/gcc" \
@@ -104,6 +132,7 @@ AutoReqProv:  no
       ./configure \
           --prefix=%{l_prefix} \
           --with-plugin-path=%{l_prefix}/lib/openhbci/plugins \
+          --with-gwen-dir=$RPM_BUILD_ROOT%{l_prefix} \
           --with-openssl-includes=%{l_prefix}/include \
           --with-openssl-libs=%{l_prefix}/lib \
           --enable-shared \
@@ -126,7 +155,7 @@ AutoReqProv:  no
           --prefix=%{l_prefix} \
           --with-plugin-path=%{l_prefix}/lib/openhbci2/plugins \
           --with-xmldata-dir=%{l_prefix}/share/openhbci2/xmldata \
-          --with-gwen-dir=%{l_prefix} \
+          --with-gwen-dir=$RPM_BUILD_ROOT%{l_prefix} \
           --with-openssl-includes=%{l_prefix}/include \
           --with-openssl-libs=%{l_prefix}/lib \
           --enable-shared \
@@ -134,33 +163,6 @@ AutoReqProv:  no
       %{l_make} %{l_mflags}
     ) || exit $?
 
-    #   build Gwhenhywfar
-    ( cd gwenhywfar-%{V_gwenhywfar}
-      %{l_shtool} subst \
-          -e 's;rm -Rf gwenhywfar;#;' \
-          configure
-      CC="%{l_cc}" \
-      CFLAGS="%{l_cflags -O}" \
-      CPPFLAGS="-I`pwd`/gwenhywfar %{l_cppflags}" \
-      LDFLAGS="-L`pwd`/src %{l_ldflags}" \
-      ./configure \
-          --prefix=%{l_prefix} \
-          --enable-ssl \
-          --with-openssl-includes=%{l_prefix}/include \
-          --with-openssl-libs=%{l_prefix}/lib \
-          --disable-nls \
-          --disable-shared
-
-      #   build the library
-      %{l_make} %{l_mflags -O}
-
-      #   pre-install it and adjust for temporary usage by AqBanking build (below)
-      %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
-      %{l_shtool} subst \
-          -e "s;%{l_prefix};$RPM_BUILD_ROOT%{l_prefix};g" \
-          $RPM_BUILD_ROOT%{l_prefix}/bin/gwenhywfar-config
-    ) || exit $?
-
     #   build AqBanking
     ( cd aqbanking-%{V_aqbanking}
       echo 'ac_cv_header_iconv_h=no' >config.cache
@@ -168,6 +170,7 @@ AutoReqProv:  no
       CFLAGS="%{l_cflags -O}" \
       CPPFLAGS="-I`pwd`/aqbanking %{l_cppflags}" \
       LDFLAGS="-L`pwd`/src/libs/aqbanking %{l_ldflags}" \
+      SHELL="%{l_bash}" \
       ./configure \
           --cache-file=./config.cache \
           --prefix=%{l_prefix} \
@@ -178,11 +181,18 @@ AutoReqProv:  no
           --disable-nls \
           --enable-shared \
           --enable-static
+      %{l_make} %{l_mflags} \
+          SHELL="%{l_bash}"
     ) || exit $?
 
 %install
     rm -rf $RPM_BUILD_ROOT
 
+    #   install Gwhenhywfar
+    ( cd gwenhywfar-%{V_gwenhywfar}
+      %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+    ) || exit $?
+
     #   install OpenHBCI v1 (legacy)
     ( cd openhbci-%{V_openhbci1}
       %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
@@ -203,12 +213,7 @@ AutoReqProv:  no
          $RPM_BUILD_ROOT%{l_prefix}/bin/openhbci2-hbcixml
     ) || exit $?
 
-    #   build Gwhenhywfar
-    ( cd gwenhywfar-%{V_gwenhywfar}
-      %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
-    ) || exit $?
-
-    #   build AqBanking
+    #   install AqBanking
     ( cd aqbanking-%{V_aqbanking}
       %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
     ) || exit $?