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:46:49
  Branch: rpm-5_1                          Handle: 2008081823464900

  Modified files:           (Branch: rpm-5_1)
    rpm                     CHANGES configure.ac
    rpm/misc                librpmmisc.vers

  Log:
    - jbj: remove internal zlib.

  Summary:
    Revision    Changes     Path
    1.2288.2.90 +1  -0      rpm/CHANGES
    2.289.2.9   +1  -1      rpm/configure.ac
    1.7.4.2     +0  -12     rpm/misc/librpmmisc.vers
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2288.2.89 -r1.2288.2.90 CHANGES
  --- rpm/CHANGES	18 Aug 2008 23:18:17 -0000	1.2288.2.89
  +++ rpm/CHANGES	18 Aug 2008 23:46:49 -0000	1.2288.2.90
  @@ -1,4 +1,5 @@
   5.1.4 -> 5.1.5:
  +    - jbj: remove internal zlib.
       - jbj: WR: add %windriver target to devtool.conf.
       - jbj: WR: eliminate most compiler warnings.
       - jbj: WR: eliminate duplicated AutoFu boilerplate, use system.h instead.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.289.2.8 -r2.289.2.9 configure.ac
  --- rpm/configure.ac	18 Aug 2008 19:47:15 -0000	2.289.2.8
  +++ rpm/configure.ac	18 Aug 2008 23:46:49 -0000	2.289.2.9
  @@ -944,7 +944,7 @@
   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
             AC_DEFINE(HAVE_ZLIB_H, 1, [Define to 1 if you have <zlib.h>])
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/misc/librpmmisc.vers
  ============================================================================
  $ cvs diff -u -r1.7.4.1 -r1.7.4.2 librpmmisc.vers
  --- rpm/misc/librpmmisc.vers	13 Aug 2008 17:05:25 -0000	1.7.4.1
  +++ rpm/misc/librpmmisc.vers	18 Aug 2008 23:46:49 -0000	1.7.4.2
  @@ -13,18 +13,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;
  @@ .