Browse Source

upgrade and unbreak builds

Ralf S. Engelschall 20 years ago
parent
commit
3bc00b4ec1
1 changed files with 11 additions and 13 deletions
  1. 11 13
      aqbanking/aqbanking.spec

+ 11 - 13
aqbanking/aqbanking.spec

@@ -23,8 +23,8 @@
 ##
 ##
 
 
 #   package version
 #   package version
-%define       V_aqbanking   1.0.12
-%define       V_gwenhywfar  1.13.3
+%define       V_aqbanking   1.2.0
+%define       V_gwenhywfar  1.14.0
 
 
 #   package information
 #   package information
 Name:         aqbanking
 Name:         aqbanking
@@ -37,7 +37,7 @@ Class:        EVAL
 Group:        Finance
 Group:        Finance
 License:      GPL
 License:      GPL
 Version:      %{V_aqbanking}
 Version:      %{V_aqbanking}
-Release:      20050614
+Release:      20050719
 
 
 #   list of sources
 #   list of sources
 Source0:      http://osdn.dl.sourceforge.net/aqbanking/aqbanking-%{V_aqbanking}.tar.gz
 Source0:      http://osdn.dl.sourceforge.net/aqbanking/aqbanking-%{V_aqbanking}.tar.gz
@@ -84,8 +84,8 @@ AutoReqProv:  no
           configure
           configure
       CC="%{l_cc}" \
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
       CFLAGS="%{l_cflags -O}" \
-      CPPFLAGS="%{l_cppflags} -I`pwd`/gwenhywfar" \
-      LDFLAGS="%{l_ldflags}" \
+      CPPFLAGS="-I`pwd`/gwenhywfar %{l_cppflags}" \
+      LDFLAGS="-L`pwd`/src %{l_ldflags}" \
       ./configure \
       ./configure \
           --prefix=%{l_prefix} \
           --prefix=%{l_prefix} \
           --enable-ssl \
           --enable-ssl \
@@ -102,19 +102,17 @@ AutoReqProv:  no
       %{l_shtool} subst \
       %{l_shtool} subst \
           -e "s;%{l_prefix};$RPM_BUILD_ROOT%{l_prefix};g" \
           -e "s;%{l_prefix};$RPM_BUILD_ROOT%{l_prefix};g" \
           $RPM_BUILD_ROOT%{l_prefix}/bin/gwenhywfar-config
           $RPM_BUILD_ROOT%{l_prefix}/bin/gwenhywfar-config
-      %{l_shtool} subst \
-          -e 's;^\(dlname=.\).*\(.\)$;\1\2;' \
-          -e 's;^\(library_names=.\).*\(.\)$;\1\2;' \
-          $RPM_BUILD_ROOT%{l_prefix}/lib/lib*.la
     ) || exit $?
     ) || exit $?
 
 
     #   build AqBanking library
     #   build AqBanking library
     ( cd aqbanking-%{V_aqbanking}
     ( cd aqbanking-%{V_aqbanking}
+      echo 'ac_cv_header_iconv_h=no' >config.cache
       CC="%{l_cc}" \
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
       CFLAGS="%{l_cflags -O}" \
-      CPPFLAGS="%{l_cppflags}" \
-      LDFLAGS="%{l_ldflags} -L`pwd`/src/libs/aqbanking" \
+      CPPFLAGS="-I`pwd`/aqbanking %{l_cppflags}" \
+      LDFLAGS="-L`pwd`/src/libs/aqbanking %{l_ldflags}" \
       ./configure \
       ./configure \
+          --cache-file=./config.cache \
           --prefix=%{l_prefix} \
           --prefix=%{l_prefix} \
           --with-gwen-dir=$RPM_BUILD_ROOT%{l_prefix} \
           --with-gwen-dir=$RPM_BUILD_ROOT%{l_prefix} \
           --disable-nls \
           --disable-nls \
@@ -151,8 +149,8 @@ AutoReqProv:  no
 
 
     #   determine installation files
     #   determine installation files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
-       %{l_files_std} \
-       '%not %dir %{l_prefix}/share/aclocal'
+        %{l_files_std} \
+        '%not %dir %{l_prefix}/share/aclocal'
 
 
 %files -f files
 %files -f files