Przeglądaj źródła

fix packaging again related to linking steps

Ralf S. Engelschall 20 lat temu
rodzic
commit
64a0b9f17e
2 zmienionych plików z 23 dodań i 0 usunięć
  1. 12 0
      aqbanking/aqbanking.patch
  2. 11 0
      aqbanking/aqbanking.spec

+ 12 - 0
aqbanking/aqbanking.patch

@@ -0,0 +1,12 @@
+Index: src/libs/aqbanking/Makefile.in
+--- src/libs/aqbanking/Makefile.in.orig	2005-04-08 02:18:00 +0200
++++ src/libs/aqbanking/Makefile.in	2005-04-22 10:20:28 +0200
+@@ -320,7 +320,7 @@
+  provider.c \
+  wcb.c
+ 
+-libaqbanking_la_LIBADD = @gwenhywfar_libs@ \
++libaqbanking_la_LIBADD = \
+  jobs/libjobs.la \
+  types/libtypes.la
+ 

+ 11 - 0
aqbanking/aqbanking.spec

@@ -42,6 +42,7 @@ Release:      20050422
 #   list of sources
 Source0:      http://osdn.dl.sourceforge.net/aqbanking/aqbanking-%{V_aqbanking}.tar.gz
 Source1:      http://osdn.dl.sourceforge.net/gwenhywfar/gwenhywfar-%{V_gwenhywfar}.tar.gz
+Patch0:       aqbanking.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -73,6 +74,7 @@ AutoReqProv:  no
 %prep
     %setup -q -c
     %setup -q -D -T -a 1
+    %patch -p0 -d aqbanking-%{V_aqbanking}
 
 %build
     #   build Gwhenhywfar library
@@ -100,6 +102,10 @@ AutoReqProv:  no
       %{l_shtool} subst \
           -e "s;%{l_prefix};$RPM_BUILD_ROOT%{l_prefix};g" \
           $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 $?
 
     #   build AqBanking library
@@ -133,6 +139,11 @@ AutoReqProv:  no
     rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/aqbanking/plugins/0/*/*.a
 
     #   post-adjust installation
+    %{l_shtool} subst \
+        -e 's;-laqbanking";-laqbanking -lgwenhywfar";' \
+        -e 's;-laqbankingpp";-laqbankingpp -lgwenpp";' \
+        -e "s;$RPM_BUILD_ROOT%{l_prefix};%{l_prefix};" \
+        $RPM_BUILD_ROOT%{l_prefix}/bin/aqbanking-config
     %{l_shtool} subst \
         -e 's;^\(dlname=.\).*\(.\)$;\1\2;' \
         -e 's;^\(library_names=.\).*\(.\)$;\1\2;' \