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 19:59:33
  Branch: HEAD                             Handle: 2010082317593200

  Modified files:
    rpm                     CHANGES Makefile.am autogen.sh devtool.conf

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

  Summary:
    Revision    Changes     Path
    1.3423      +1  -0      rpm/CHANGES
    2.251       +2  -0      rpm/Makefile.am
    2.107       +42 -26     rpm/autogen.sh
    2.340       +6  -6      rpm/devtool.conf
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3422 -r1.3423 CHANGES
  --- rpm/CHANGES	23 Aug 2010 17:03:16 -0000	1.3422
  +++ rpm/CHANGES	23 Aug 2010 17:59:32 -0000	1.3423
  @@ -1,4 +1,5 @@
   5.3.2 -> 5.4a1:
  +    - 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/Makefile.am
  ============================================================================
  $ cvs diff -u -r2.250 -r2.251 Makefile.am
  --- rpm/Makefile.am	25 Jun 2010 17:20:56 -0000	2.250
  +++ rpm/Makefile.am	23 Aug 2010 17:59:32 -0000	2.251
  @@ -63,6 +63,8 @@
   	@WITH_ZLIB_SUBDIR@ \
   	@WITH_PCRE_SUBDIR@ \
   	@WITH_LUA_SUBDIR@ \
  +	@WITH_BEECRYPT_SUBDIR@ \
  +	@WITH_NEON_SUBDIR@ \
   	@WITH_SPIDERMONKEY_SUBDIR@ \
   	@WITH_FILE_SUBDIR@ \
   	@WITH_BASH_SUBDIR@ \
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/autogen.sh
  ============================================================================
  $ cvs diff -u -r2.106 -r2.107 autogen.sh
  --- rpm/autogen.sh	25 Jun 2010 17:07:16 -0000	2.106
  +++ rpm/autogen.sh	23 Aug 2010 17:59:32 -0000	2.107
  @@ -40,33 +40,50 @@
   [ "`libtoolize --version | head -1`" != "$LTV" ] && echo "$USAGE" # && exit 1
   [ "`gettextize --version | head -1 | sed -e 's;^.*/\\(gettextize\\);\\1;'`" != "$GTT" ] && echo "$USAGE" # && exit 1
   
  -echo "===> pcre"
  -( cd pcre && sh ./autogen.sh --noconfigure "$@" )
  -echo "<=== pcre"
  -echo "===> xz"
  -( cd xz && sh ./autogen.sh --noconfigure "$@" )
  -echo "<=== xz"
  -echo "===> file"
  -( cd file && sh ./autogen.sh --noconfigure "$@" )
  -echo "<=== file"
  +for dir in bash beecrypt file neon pcre rc syck xar xz; do
   
  -if [ -d rc ]; then
  -    echo "===> rc"
  -    ( cd rc && sh ./autogen.sh --noconfigure "$@" )
  -    echo "<=== rc"
  -fi
  -if [ -d bash ]; then
  -    echo "===> bash"
  -    ( cd bash && sh ./autogen.sh --noconfigure "$@" )
  -    echo "<=== bash"
  +  if [ -d $dir ]; then
  +    echo "===> $dir"
  +    ( cd $dir && sh ./autogen.sh --noconfigure "$@" )
  +    echo "<=== $dir"
   fi
  +done
   
  -echo "===> syck"
  -( cd syck && sh ./autogen.sh --noconfigure "$@" )
  -echo "<=== syck"
  -echo "===> xar"
  -( cd xar && sh ./autogen.sh --noconfigure "$@" )
  -echo "<=== xar"
  +#if [ -d pcre ]; then
  +#    echo "===> pcre"
  +#    ( cd pcre && sh ./autogen.sh --noconfigure "$@" )
  +#    echo "<=== pcre"
  +#fi
  +#if [ -d xz ]; then
  +#    echo "===> xz"
  +#    ( cd xz && sh ./autogen.sh --noconfigure "$@" )
  +#    echo "<=== xz"
  +#fi
  +#if [ -d file ]; then
  +#    echo "===> file"
  +#    ( cd file && sh ./autogen.sh --noconfigure "$@" )
  +#    echo "<=== file"
  +#fi
  +#if [ -d rc ]; then
  +#    echo "===> rc"
  +#    ( cd rc && sh ./autogen.sh --noconfigure "$@" )
  +#    echo "<=== rc"
  +#fi
  +#if [ -d bash ]; then
  +#    echo "===> bash"
  +#    ( cd bash && sh ./autogen.sh --noconfigure "$@" )
  +#    echo "<=== bash"
  +#fi
  +#if [ -d syck ]; then
  +#    echo "===> syck"
  +#    ( cd syck && sh ./autogen.sh --noconfigure "$@" )
  +#    echo "<=== syck"
  +#fi
  +#if [ -d xar ]; then
  +#    echo "===> xar"
  +#    ( cd xar && sh ./autogen.sh --noconfigure "$@" )
  +#    echo "<=== xar"
  +#fi
   
   echo "===> rpm"
   rm -rf autom4te.cache || true
  @@ -76,8 +93,7 @@
   po_dir=./po
   LANG=C
   ls "$po_dir"/*.po 2>/dev/null |
  -      sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS"
  -
  +	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.339 -r2.340 devtool.conf
  --- rpm/devtool.conf	23 Jul 2010 18:19:52 -0000	2.339
  +++ rpm/devtool.conf	23 Aug 2010 17:59:32 -0000	2.340
  @@ -3,7 +3,7 @@
   ##
   
   %common
  -    MODULE_NAMES="db lua file xar xz pcre syck js/src rc"
  +    MODULE_NAMES="db lua file xar xz pcre syck js/src rc neon"
       MODULE_TAG_DB=""
       MODULE_TAG_LUA=""
       MODULE_TAG_FILE=""
  @@ -84,19 +84,19 @@
           --with-tcl \
           --with-sqlite=external \
           --with-syck=internal \
  -        --with-readline=external \
  +        --without-readline \
           --without-augeas \
           --with-beecrypt=external \
           --with-openssl=external \
           --with-nss=external \
           --with-gcrypt=external \
  -        --with-tomcrypt=external \
  -        --with-tpm=external \
  +        --without-tomcrypt \
  +        --without-tpm \
           --without-expat \
  -        --with-libtasn1 \
  +        --with-libtasn1=external \
           --without-pakchois \
           --without-gnutls \
  -        --with-neon=external \
  +        --with-neon=internal \
           --with-pcre=internal \
           --without-uuid \
           --with-attr \
  @@ .