RPM Package Manager, CVS Repository
  /cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   23-Aug-2010 20:02:34
  Branch: rpm-5_3                          Handle: 2010082318023300

  Modified files:           (Branch: rpm-5_3)
    rpm                     CHANGES autogen.sh devtool.conf

  Log:
    - neon: finish up --with-neon=internal wiring into -lrpmmisc.

  Summary:
    Revision    Changes     Path
    1.3296.2.65 +1  -0      rpm/CHANGES
    2.105.2.2   +4  -0      rpm/autogen.sh
    2.333.2.16  +9  -7      rpm/devtool.conf
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3296.2.64 -r1.3296.2.65 CHANGES
  --- rpm/CHANGES	23 Aug 2010 17:03:36 -0000	1.3296.2.64
  +++ rpm/CHANGES	23 Aug 2010 18:02:33 -0000	1.3296.2.65
  @@ -1,4 +1,5 @@
   5.3.2 -> 5.3.3:
  +    - jbj: neon: finish up --with-neon=internal wiring into -lrpmmisc.
       - jbj: misc: add ne_* symbols to loader map for --with-neon=internal.
       - jbj: grep: leave rpmgrep internal, autopoint gets heartburn.
       - jbj: pcre: upgrade to pcre-8.10.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/autogen.sh
  ============================================================================
  $ cvs diff -u -r2.105.2.1 -r2.105.2.2 autogen.sh
  --- rpm/autogen.sh	23 May 2010 21:55:07 -0000	2.105.2.1
  +++ rpm/autogen.sh	23 Aug 2010 18:02:33 -0000	2.105.2.2
  @@ -90,6 +90,10 @@
   echo "---> generate files via GNU libtool (libtoolize)"
   libtoolize --quiet --copy --force --install
   echo "---> generate files via GNU gettext (autopoint)"
  +po_dir=./po
  +LANG=C
  +ls "$po_dir"/*.po 2>/dev/null |
  +	sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS"
   autopoint --force
   echo "---> generate files via GNU autoconf (aclocal, autoheader)"
   rm -f aclocal.m4
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.333.2.15 -r2.333.2.16 devtool.conf
  --- rpm/devtool.conf	23 Aug 2010 13:54:42 -0000	2.333.2.15
  +++ rpm/devtool.conf	23 Aug 2010 18:02:33 -0000	2.333.2.16
  @@ -64,6 +64,7 @@
       %checkout
       %system
   
  +#        --with-perlembed=/usr/lib/perl5/5.10.0/i386-linux-thread-multi/CORE:/usr/lib/perl5/CORE \
   %system
       #   configure RPM 5 with maximum internal (independence) and maximum
       #   external (reusability) extend as it usually is the case when
  @@ -75,6 +76,7 @@
       %configure \
           --verbose \
           --prefix=/usr \
  +	--enable-shared \
           --with-db=internal \
           --with-db-sql \
           --with-db-tools-integrated \
  @@ -87,21 +89,21 @@
           --with-tcl=external \
           --with-sqlite=external \
           --with-syck=internal \
  -        --with-readline=external \
  -        --with-augeas=external \
  -        --with-beecrypt=external \
  +        --without-readline \
  +        --without-augeas \
  +        --with-beecrypt=internal \
           --without-java \
           --with-openssl=external \
           --with-nss=external \
           --with-gcrypt=external \
  -        --with-tomcrypt=external \
  +        --without-tomcrypt \
           --without-expat \
           --without-libtasn1 \
           --without-pakchois \
           --without-gnutls \
  -        --with-neon=external \
  +        --with-neon=internal \
           --with-pcre=internal \
  -        --with-uuid=system \
  +        --without-uuid \
           --with-attr \
           --with-acl \
           --without-xar \
  @@ -120,7 +122,7 @@
           --with-python \
           --with-pythonembed=/usr/lib:/usr/include/python2.6 \
           --with-perl \
  -        --with-perlembed=/usr/lib/perl5/5.10.0/i386-linux-thread-multi/CORE:/usr/lib/perl5/CORE \
  +        --without-perlembed \
           --with-ruby=/usr/lib/ruby/1.8/i386-linux \
           --with-selinux \
           --with-sepol \
  @@ .