OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   20-Apr-2005 17:29:25
  Branch: HEAD                             Handle: 2005042016292400

  Modified files:
    openpkg-src/aqbanking   aqbanking.spec

  Log:
    improve packaging

  Summary:
    Revision    Changes     Path
    1.2         +18 -4      openpkg-src/aqbanking/aqbanking.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/aqbanking/aqbanking.spec
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 aqbanking.spec
  --- openpkg-src/aqbanking/aqbanking.spec      20 Apr 2005 13:58:30 -0000      
1.1
  +++ openpkg-src/aqbanking/aqbanking.spec      20 Apr 2005 15:29:24 -0000      
1.2
  @@ -75,6 +75,7 @@
       %setup -q -D -T -a 1
   
   %build
  +    #   build Gwhenhywfar library
       ( cd gwenhywfar-%{V_gwenhywfar}
         CC="%{l_cc}" \
         CFLAGS="%{l_cflags -O}" \
  @@ -87,16 +88,24 @@
             --with-openssl-libs=%{l_prefix}/lib \
             --disable-nls \
             --disable-shared
  +
  +      #   workaround the fact that the library expects itself to be already 
installed
         %{l_shtool} mkdir -f -p -m 755 \
             gwenhywfar/ui
         ( cd gwenhywfar; ln -s ../src/*.h ../src/*/*.h 
../src/os/posix/system.h . ) || exit $?
         ( cd gwenhywfar/ui; ln -s ../../gwenui/*.h . ) || exit $?
  +
  +      #   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 library
       ( cd aqbanking-%{V_aqbanking}
         CC="%{l_cc}" \
         CFLAGS="%{l_cflags -O}" \
  @@ -106,13 +115,12 @@
             --prefix=%{l_prefix} \
             --with-gwen-dir=$RPM_BUILD_ROOT%{l_prefix} \
             --disable-nls \
  -          --disable-shared
  +          --enable-shared \
  +          --enable-static
       ) || exit $?
  -    %{l_shtool} subst \
  -        -e "s;$RPM_BUILD_ROOT%{l_prefix};%{l_prefix};g" \
  -        $RPM_BUILD_ROOT%{l_prefix}/bin/gwenhywfar-config
   
   %install
  +    #   install libraries
       rm -rf $RPM_BUILD_ROOT
       ( cd gwenhywfar-%{V_gwenhywfar}
         %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
  @@ -120,8 +128,14 @@
       ( cd aqbanking-%{V_aqbanking}
         %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
       ) || exit $?
  +
  +    #   strip down installation
       strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
       rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/gwen-public-ca.crt
  +    rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.so*
  +    rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/aqbanking/plugins/0/*/*.a
  +
  +    #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
          %{l_files_std} \
          '%not %dir %{l_prefix}/share/aclocal'
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to