[CVS] OpenPKG: openpkg-src/openpkg/ openpkg.spec

[Ralf S. Engelschall]

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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   13-Jan-2003 14:59:44
  Branch: HEAD                             Handle: 2003011313594400

  Modified files:
    openpkg-src/openpkg     openpkg.spec

  Log:
    make sure we stop on errors

  Summary:
    Revision    Changes     Path
    1.126       +17 -17     openpkg-src/openpkg/openpkg.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/openpkg.spec
  ============================================================================
  $ cvs diff -u -r1.125 -r1.126 openpkg.spec
  --- openpkg-src/openpkg/openpkg.spec  10 Jan 2003 16:55:22 -0000      1.125
  +++ openpkg-src/openpkg/openpkg.spec  13 Jan 2003 13:59:44 -0000      1.126
  @@ -39,8 +39,8 @@
   #   o any cc(1)
   
   #   the package version and release
  -%define       V_openpkg 20030110
  -%define       R_openpkg 20030110
  +%define       V_openpkg 20030113
  +%define       R_openpkg 20030113
   
   #   the used software versions
   %define       V_rpm     4.0.2
  @@ -316,7 +316,7 @@
         CC="${l_cc}" ./configure --disable-largefile
         ${l_make}
         (mv patch ..; ${l_make} clean || true; mv ../patch .)
  -    )
  +    ) || exit $?
       l_patch="`pwd`/patch-%{V_patch}/patch"; export l_patch
       echo "l_patch=\"$l_patch\"; export l_patch" >>.buildenv
   
  @@ -327,20 +327,20 @@
         ${l_patch} -p0 <`SOURCE rpm.patch.porting`
         ${l_patch} -p0 <`SOURCE rpm.patch.regen`
         touch aclocal.m4 configure
  -    )
  +    ) || exit $?
       ( cd db-%{V_db}
         ${l_patch} -p0 <`SOURCE db.patch`
  -    )
  +    ) || exit $?
       ( cd make-%{V_make}
         ${l_patch} -p0 <`SOURCE make.patch`
  -    )
  +    ) || exit $?
   
       #   bootstrap GNU make tool
       ( cd make-%{V_make}
         CC="${l_cc}" ./configure --disable-nls --disable-largefile
         ${l_make}
         (mv make ..; ${l_make} clean || true; mv ../make .)
  -    )
  +    ) || exit $?
       l_make="`pwd`/make-%{V_make}/make"; export l_make
       echo "l_make=\"$l_make\"; export l_make" >>.buildenv
   
  @@ -364,7 +364,7 @@
           echo "ac_cv_func_textdomain=no"
           echo "ac_cv_func_bindtextdomain=no"
           echo "ac_cv_lib_intl_bindtextdomain=no"
  -      ) >config.cache
  +      ) >config.cache || exit $?
         CC="${l_cc}"
         ./configure \
             --cache-file=./config.cache \
  @@ -373,8 +373,8 @@
             --without-gnu-malloc \
             --disable-nls
         ${l_make} || exit $?
  -      ( mv bash ..; ${l_make} clean || true; mv ../bash . )
  -    )
  +      (mv bash ..; ${l_make} clean || true; mv ../bash .)
  +    ) || exit $?
   
       #   build GNU tar tool
       ( cd tar-%{V_tar}
  @@ -389,18 +389,18 @@
             --disable-nls
         ${l_make} || exit $?
         (mv src/tar ..; ${l_make} clean || true; mv ../tar src/)
  -    )
  +    ) || exit $?
   
       #   build BZIP2 library
       ( cd bzip2-%{V_bzip2}
         ${l_make} CC="${l_cc}" CFLAGS="-O" libbz2.a bzip2 || exit $?
  -    )
  +    ) || exit $?
   
       #   build ZLIB library
       ( cd zlib-%{V_zlib}
         CC="${l_cc}" CFLAGS="-O" ./configure
         ${l_make} CC="${l_cc}" CFLAGS="-O" libz.a || exit $?
  -    )
  +    ) || exit $?
   
       #   build cURL tool
       ( cd curl-%{V_curl}
  @@ -418,7 +418,7 @@
             --with-zlib=`pwd`/../zlib-%{V_zlib}
         ${l_make} || exit $?
         (mv src/curl ..; ${l_make} clean || true; mv ../curl ./src)
  -    )
  +    ) || exit $?
   
       #   build Berkeley-DB library
       ( cd db-%{V_db}/build_unix
  @@ -428,7 +428,7 @@
         CC="${l_cc}" ../dist/configure
         ${l_make} libdb.a || exit $?
         ln libdb.a libdbXXX.a # workaround for Tru64
  -    )
  +    ) || exit $?
   
       #   build RPM
       #   - we make sure RPM builds without NLS/gettext problems :-(
  @@ -481,7 +481,7 @@
             $nlsopt
         ${l_make} \
             EXTRA_LIBS="-L$br/db-%{V_db}/build_unix -ldbXXX -L$br/zlib-%{V_zlib} -lz 
-L$br/bzip2-%{V_bzip2} -lbz2"
  -    )
  +    ) || exit $?
   
   %install
       #   skip in bootstrap phase 2 (see openpkg.boot)
  @@ -524,7 +524,7 @@
       #   install RPM into installation hierarchy
       ( cd rpm-%{V_rpm}
         ${l_make} DESTDIR="$RPM_BUILD_ROOT" install
  -    )
  +    ) || exit $?
   
       #   strip RPM installation
       strip $RPM_BUILD_ROOT%{l_prefix}/bin/* \
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]