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:   22-Jun-2007 22:11:03
  Branch: HEAD                             Handle: 2007062221110300

  Modified files:
    rpm                     configure.ac devtool.conf
    rpm/python              Makefile.am

  Log:
    assume beecrypt is always external, hotwire -I/usr/include/beecrypt.
    assume zlib is always internal, hotwire -DHAVE_ZLIB=1
    avoid multiply defined in python, hotwire LIBS=

  Summary:
    Revision    Changes     Path
    2.107       +7  -4      rpm/configure.ac
    2.12        +1  -2      rpm/devtool.conf
    1.68        +2  -1      rpm/python/Makefile.am
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.106 -r2.107 configure.ac
  --- rpm/configure.ac	21 Jun 2007 18:58:05 -0000	2.106
  +++ rpm/configure.ac	22 Jun 2007 20:11:03 -0000	2.107
  @@ -320,8 +320,10 @@
   
   RPM_CHECK_LIB([ZLib], [zlib],
                 [z gz], [gzread], [zlib.h],
  -              [yes,internal:external:none], [zlib],
  -              [AC_CHECK_FUNC(gzseek)], [])
  +              [yes,internal], [zlib],
  +              [AC_CHECK_FUNC(gzseek)
  +               AC_DEFINE(HAVE_ZLIB_H, 1, [Define to 1 if you have zlib.h])
  +              ], [])
   
   RPM_CHECK_LIB([GNU BZip2], [bzip2],
                 [bz2], [BZ2_bzread], [bzlib.h],
  @@ -530,8 +532,9 @@
   
   RPM_CHECK_LIB([BeeCrypt], [beecrypt],
                 [beecrypt], [mpfprintln], [beecrypt/api.h],
  -              [yes,external:internal], [beecrypt],
  -              [], [ AC_ERROR([mandatory BeeCrypt library not found]) ])
  +              [yes,external], [beecrypt],
  +              [ CPPFLAGS="${CPPFLAGS} -I${prefix}/include/beecrypt"
  +              ], [ AC_ERROR([mandatory BeeCrypt library not found]) ])
   
   #=================
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.11 -r2.12 devtool.conf
  --- rpm/devtool.conf	22 Jun 2007 16:27:40 -0000	2.11
  +++ rpm/devtool.conf	22 Jun 2007 20:11:03 -0000	2.12
  @@ -45,9 +45,8 @@
       %configure "$@"
   
   %jbj
  -    %checkout file
       %autogen
  -    %configure --prefix=/usr --with-sqlite=external --with-beecrypt=external --with-neon=external --with-bzip2=external --with-popt=external
  +    %configure --prefix=/usr --with-sqlite=external --with-beecrypt=external --with-neon=external --with-bzip2=external --with-zlib=internal --with-popt=external
   
   %tarball
       %checkout
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/python/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.67 -r1.68 Makefile.am
  --- rpm/python/Makefile.am	20 Jun 2007 21:10:21 -0000	1.67
  +++ rpm/python/Makefile.am	22 Jun 2007 20:11:03 -0000	1.68
  @@ -35,11 +35,12 @@
   	@WITH_LIBELF_LIB@
   
   LDADD =
  +LIBS =
   
   rpmdir = $(pylibdir)/site-packages/rpm
   rpm_LTLIBRARIES = _rpmmodule.la
   
  -_rpmmodule_la_LDFLAGS = $(mylibs) $(LIBS) -module -avoid-version
  +_rpmmodule_la_LDFLAGS = $(mylibs) -module -avoid-version
   _rpmmodule_la_LIBADD =
   
   _rpmmodule_la_SOURCES = rpmmodule.c header-py.c \
  @@ .