RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   19-Aug-2008 01:29:27
  Branch: HEAD                             Handle: 2008081823292700

  Modified files:
    rpm                     CHANGES autogen.sh configure.ac devtool.conf
    rpm/misc                librpmmisc.vers

  Log:
    - jbj: remove internal zlib.

  Summary:
    Revision    Changes     Path
    1.2528      +1  -0      rpm/CHANGES
    2.96        +0  -3      rpm/autogen.sh
    2.310       +2  -2      rpm/configure.ac
    2.239       +3  -4      rpm/devtool.conf
    1.9         +0  -12     rpm/misc/librpmmisc.vers
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2527 -r1.2528 CHANGES
  --- rpm/CHANGES	18 Aug 2008 19:16:09 -0000	1.2527
  +++ rpm/CHANGES	18 Aug 2008 23:29:27 -0000	1.2528
  @@ -1,5 +1,6 @@
   
   5.1.0 -> 5.2a0:
  +    - jbj: remove internal zlib.
       - jbj: WR: eliminate most compiler warnings.
       - jbj: WR: eliminate duplicated AutoFu boilerplate, use system.h instead.
       - jbj: WR: eliminate getdate.[ch], use same from rpmio instead.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/autogen.sh
  ============================================================================
  $ cvs diff -u -r2.95 -r2.96 autogen.sh
  --- rpm/autogen.sh	26 May 2008 14:16:57 -0000	2.95
  +++ rpm/autogen.sh	18 Aug 2008 23:29:27 -0000	2.96
  @@ -40,9 +40,6 @@
   [ "`libtoolize --version | head -1`" != "$LTV" ] && echo "$USAGE" # && exit 1
   [ "`gettextize --version | head -1 | sed -e 's;^.*/\\(gettextize\\);\\1;'`" != "$GTT" ] && echo "$USAGE" # && exit 1
   
  -echo "===> zlib"
  -( cd zlib && sh ./autogen.sh --noconfigure "$@" )
  -echo "<=== zlib"
   echo "===> lzma"
   ( cd lzma && sh ./autogen.sh --noconfigure "$@" )
   echo "<=== lzma"
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.309 -r2.310 configure.ac
  --- rpm/configure.ac	18 Aug 2008 15:30:17 -0000	2.309
  +++ rpm/configure.ac	18 Aug 2008 23:29:27 -0000	2.310
  @@ -957,9 +957,9 @@
   RPM_CHECK_LIB(
       [ZLib], [zlib],
       [rpmz z gz], [gzread], [zlib.h],
  -    [yes,internal:none], [zlib],
  +    [yes,external:none], [zlib],
       [ AC_CHECK_FUNC(gzseek)
  -      if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
  +      if test ".$RPM_CHECK_LIB_LOCATION" = .external; then
             AC_DEFINE(HAVE_ZLIB_H, 1, [Define to 1 if you have <zlib.h>])
         fi
       ], [])
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.238 -r2.239 devtool.conf
  --- rpm/devtool.conf	13 Aug 2008 11:19:53 -0000	2.238
  +++ rpm/devtool.conf	18 Aug 2008 23:29:27 -0000	2.239
  @@ -3,10 +3,9 @@
   ##
   
   %common
  -    MODULE_NAMES="db lua zlib file xar lzma"
  +    MODULE_NAMES="db lua file xar lzma"
       MODULE_TAG_DB=""
       MODULE_TAG_LUA=""
  -    MODULE_TAG_ZLIB=""
       MODULE_TAG_FILE=""
       MODULE_TAG_XAR=""
       MODULE_TAG_LZMA=""
  @@ -70,7 +69,7 @@
           --prefix=/usr \
           --with-db=internal \
           --with-db-tools-integrated \
  -        --with-zlib=internal \
  +        --with-zlib=external \
           --with-lzma=internal \
           --with-file=internal \
           --with-lua=internal \
  @@ -1540,7 +1539,7 @@
               --with-bugreport="afb@rpm5.org" \
               --with-db=internal \
               --with-lua=internal \
  -            --with-zlib=internal \
  +            --with-zlib=external \
               --with-file=internal \
               --with-xar=internal \
               --with-lzma=internal \
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/misc/librpmmisc.vers
  ============================================================================
  $ cvs diff -u -r1.8 -r1.9 librpmmisc.vers
  --- rpm/misc/librpmmisc.vers	12 Aug 2008 15:46:30 -0000	1.8
  +++ rpm/misc/librpmmisc.vers	18 Aug 2008 23:29:27 -0000	1.9
  @@ -19,18 +19,6 @@
       magic_file;
       magic_load;
       magic_open;
  -    rpmz_gzclose;
  -    rpmz_adler32;
  -    rpmz_adler32_combine;
  -    rpmz_crc32;
  -    rpmz_crc32_combine;
  -    rpmz_gzdopen;
  -    rpmz_gzerror;
  -    rpmz_gzflush;
  -    rpmz_gzopen;
  -    rpmz_gzread;
  -    rpmz_gzseek;
  -    rpmz_gzwrite;
       xar_add_frombuffer;
       xar_close;
       xar_extract_tobuffersz;
  @@ .