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

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
  Module: rpm file zlib                    Date:   24-Jul-2007 00:26:48
  Branch: HEAD                             Handle: 2007072323264701

  Modified files:
    file/src                Makefile.am
    rpm                     configure.ac devtool.conf
    zlib                    Makefile.am

  Log:
    switch internal zlib fron libz to librpmz in order to circumvent a
    conflict with the external zlib (which is usually pulled in via NEON,
    etc)

  Summary:
    Revision    Changes     Path
    1.30        +1  -1      file/src/Makefile.am
    2.215       +1  -1      rpm/configure.ac
    2.67        +0  -1      rpm/devtool.conf
    1.23        +11 -11     zlib/Makefile.am
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: file/src/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.29 -r1.30 Makefile.am
  --- file/src/Makefile.am	23 Jul 2007 21:19:21 -0000	1.29
  +++ file/src/Makefile.am	23 Jul 2007 22:26:47 -0000	1.30
  @@ -21,7 +21,7 @@
   noinst_PROGRAMS = file
   file_SOURCES = file.c
   file_LDFLAGS = -L$(top_builddir)/../zlib
  -file_LDADD = libmagic.la
  +file_LDADD = libmagic.la -lrpmz
   
   listobjs:
   	@echo $(libmagic_la_SOURCES:.c=.lo) > $@
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.214 -r2.215 configure.ac
  --- rpm/configure.ac	23 Jul 2007 15:03:41 -0000	2.214
  +++ rpm/configure.ac	23 Jul 2007 22:26:47 -0000	2.215
  @@ -793,7 +793,7 @@
   dnl # ZLib
   RPM_CHECK_LIB(
       [ZLib], [zlib],
  -    [z gz], [gzread], [zlib.h],
  +    [rpmz z gz], [gzread], [zlib.h],
       [yes,internal:none], [zlib],
       [ AC_CHECK_FUNC(gzseek)
         if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.66 -r2.67 devtool.conf
  --- rpm/devtool.conf	23 Jul 2007 21:56:25 -0000	2.66
  +++ rpm/devtool.conf	23 Jul 2007 22:26:47 -0000	2.67
  @@ -75,7 +75,6 @@
           --enable-build-pie \
           --enable-build-versionscript \
           --enable-build-warnings \
  -        --disable-build-extlibdep \
           --enable-maintainer-mode
   
   %fray-cross
  @@ .
  patch -p0 <<'@@ .'
  Index: zlib/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.22 -r1.23 Makefile.am
  --- zlib/Makefile.am	27 Jun 2007 20:20:28 -0000	1.22
  +++ zlib/Makefile.am	23 Jul 2007 22:26:48 -0000	1.23
  @@ -9,36 +9,36 @@
   	crc32.h deflate.h inffast.h inffixed.h inflate.h \
   	inftrees.h trees.h zconf.h zlib.h zutil.h
   
  -noinst_LTLIBRARIES = libz.la
  +noinst_LTLIBRARIES = librpmz.la
   
  -libz_la_SOURCES = \
  +librpmz_la_SOURCES = \
   	adler32.c compress.c crc32.c deflate.c gzio.c \
   	infback.c inffast.c inflate.c inftrees.c \
   	trees.c uncompr.c zutil.c
  -libz_la_LDFLAGS =
  -libz.la: $(libz_la_OBJECTS) $(libz_la_DEPENDENCIES) 
  -	$(libz_la_LINK) $(libz_la_OBJECTS) $(libz_la_LIBADD)
  +librpmz_la_LDFLAGS =
  +librpmz.la: $(librpmz_la_OBJECTS) $(librpmz_la_DEPENDENCIES) 
  +	$(librpmz_la_LINK) $(librpmz_la_OBJECTS) $(librpmz_la_LIBADD)
   
   noinst_PROGRAMS = example minigzip
   
   example_SOURCES = example.c
  -example_LDFLAGS = libz.la
  +example_LDFLAGS = librpmz.la
   
   minigzip_SOURCES = minigzip.c
  -minigzip_LDFLAGS = libz.la
  +minigzip_LDFLAGS = librpmz.la
   
   BUILT_SOURCES = # Doxyfile zlib.lcd
   
  -zlib.lcd: Makefile.am ${libz_la_SOURCES} ${noinst_HEADERS}
  -	-lclint ${DEFS} ${INCLUDES} ${libz_la_SOURCES} -dump $@ 2>/dev/null
  +zlib.lcd: Makefile.am ${librpmz_la_SOURCES} ${noinst_HEADERS}
  +	-lclint ${DEFS} ${INCLUDES} ${librpmz_la_SOURCES} -dump $@ 2>/dev/null
   
   .PHONY: sources
   sources:
  -	@echo $(libz_la_SOURCES:%=zlib/%)
  +	@echo $(librpmz_la_SOURCES:%=zlib/%)
   
   .PHONY: lint
   lint:
  -	$(LINT) $(DEFS) $(INCLUDES) $(libz_la_SOURCES) minigzip.c
  +	$(LINT) $(DEFS) $(INCLUDES) $(librpmz_la_SOURCES) minigzip.c
   
   .PHONY: doxygen
   doxygen apidocs: Doxyfile
  @@ .