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:   05-Feb-2008 15:23:09
  Branch: HEAD                             Handle: 2008020514230800

  Modified files:
    rpm                     CHANGES configure.ac devtool.conf

  Log:
    - test for POPT earlier to avoid popt being blamed for neon configure failures.
    - add --with-uuid=external, --with-pcre=external to devtool "system".

  Summary:
    Revision    Changes     Path
    1.2136      +2  -0      rpm/CHANGES
    2.282       +8  -8      rpm/configure.ac
    2.180       +2  -0      rpm/devtool.conf
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2135 -r1.2136 CHANGES
  --- rpm/CHANGES	4 Feb 2008 19:09:32 -0000	1.2135
  +++ rpm/CHANGES	5 Feb 2008 14:23:08 -0000	1.2136
  @@ -1,4 +1,6 @@
   5.0.0 -> 5.1a1:
  +    - jbj: test for POPT earlier to avoid popt being blamed for neon configure failures.
  +    - jbj: add --with-uuid=external, --with-pcre=external to devtool "system".
       - rse: ensure that RPM Lua function util.rsplit("", ...) returns an empty table
       - jbj: "+bing" -- handle no *.rpm package found condition correctly.
       - jbj: "+bing" -- limit Fts(3) recursion to target directory traversal only.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.281 -r2.282 configure.ac
  --- rpm/configure.ac	29 Jan 2008 14:43:52 -0000	2.281
  +++ rpm/configure.ac	5 Feb 2008 14:23:08 -0000	2.282
  @@ -909,6 +909,13 @@
   
   AC_MSG_HEADER([THIRD-PARTY LIBRARIES (2/2)])
   
  +dnl # POPT
  +RPM_CHECK_LIB(
  +    [POPT], [popt],
  +    [popt], [poptGetContext], [popt.h],
  +    [yes,external], [],
  +    [], [AC_MSG_ERROR([mandatory POPT library not found])])
  +
   dnl # ZLib
   RPM_CHECK_LIB(
       [ZLib], [zlib],
  @@ -972,13 +979,6 @@
         fi
       ], [])
   
  -dnl # POPT
  -RPM_CHECK_LIB(
  -    [POPT], [popt],
  -    [popt], [poptGetContext], [popt.h],
  -    [yes,external], [],
  -    [], [AC_MSG_ERROR([mandatory POPT library not found])])
  -
   dnl # Berkeley-DB & SQLite
   DBLIBSRCS=""
   RPM_CHECK_LIB(
  @@ -1084,7 +1084,7 @@
   dnl # OSSP uuid
   RPM_CHECK_LIB(
       [OSSP uuid], [uuid],
  -    [uuid], [uuid_import], [uuid.h],
  +    [ossp-uuid uuid], [uuid_import], [uuid.h],
       [no,external:none], [],
       [ dnl # enable OSSP uuid native API support for embedded Lua
         if test ".$WITH_LUA" = .yes; then
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.179 -r2.180 devtool.conf
  --- rpm/devtool.conf	2 Feb 2008 09:45:52 -0000	2.179
  +++ rpm/devtool.conf	5 Feb 2008 14:23:08 -0000	2.180
  @@ -76,6 +76,8 @@
           --with-beecrypt=external \
           --with-nss=external \
           --with-neon=external \
  +        --with-pcre=external \
  +        --with-uuid=external \
           --with-xar=internal \
           --with-bzip2=external \
           --with-popt=external \
  @@ .