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                              Date:   07-Nov-2007 09:23:41
  Branch: HEAD                             Handle: 2007110708234100

  Modified files:
    rpm                     INSTALL devtool.conf

  Log:
    step up to latest GNU gettext after I got it building without iconv
    stuff

  Summary:
    Revision    Changes     Path
    2.56        +2  -2      rpm/INSTALL
    2.118       +6  -2      rpm/devtool.conf
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/INSTALL
  ============================================================================
  $ cvs diff -u -r2.55 -r2.56 INSTALL
  --- rpm/INSTALL	6 Nov 2007 07:31:06 -0000	2.55
  +++ rpm/INSTALL	7 Nov 2007 08:23:41 -0000	2.56
  @@ -15,7 +15,7 @@
   GNU autoconf    mandatory 2.59b   2.61    http://www.gnu.org/software/autoconf/
   GNU automake    mandatory 1.8     1.10    http://www.gnu.org/software/automake/
   GNU libtool     mandatory 1.5     1.5.24  http://www.gnu.org/software/libtool/
  -GNU gettext     mandatory 0.16    0.16.1  http://www.gnu.org/software/gettext/
  +GNU gettext     mandatory 0.16    0.17    http://www.gnu.org/software/gettext/
   --------------- --------- ------- ------- -------------------------------------
   
   Build-Time
  @@ -37,7 +37,7 @@
   ZLib        [3] optional  1.2     1.2.3   http://www.zlib.net/
   Bzip2           optional  1.0     1.0.4   http://www.bzip.org/
   File/magic  [4] optional  4.0     4.21    ftp://ftp.astron.com/pub/file/
  -GNU gettext     optional  0.16    0.16.1  http://www.gnu.org/software/gettext/
  +GNU gettext     optional  0.16    0.17    http://www.gnu.org/software/gettext/
   GNU iconv       optional  1.11    1.11    http://www.gnu.org/software/libiconv/
   PCRE            optional  7.0     7.4     http://www.pcre.org/
   DMalloc         optional  5       5.5.2   http://dmalloc.com/
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.117 -r2.118 devtool.conf
  --- rpm/devtool.conf	6 Nov 2007 07:31:06 -0000	2.117
  +++ rpm/devtool.conf	7 Nov 2007 08:23:41 -0000	2.118
  @@ -202,7 +202,7 @@
           v_autoconf="2.61"
           v_automake="1.10"
           v_libtool="1.5.24"
  -        v_gettext="0.16.1"
  +        v_gettext="0.17"
   
           #   third-party library distribution versions
           v_zlib="1.2.3"
  @@ -468,12 +468,16 @@
                           -e 's;@BUILDCSHARP@;no;g' \
                           gettext-tools/src/Makefile.in
                       $SHTOOL subst \
  -                        -e 's;^\(SUBDIRS =.*\)tests examples;\1;' \
  +                        -e 's;^\(SUBDIRS =.*\)tests gnulib-tests examples;\1;' \
                           gettext-tools/Makefile.in
                       $SHTOOL subst \
                           -e 's;\#if USEJEXE;#ifdef USEJEXE;' \
                           gettext-tools/src/read-java.c \
                           gettext-tools/src/urlget.c
  +                    $SHTOOL subst \
  +                        -e 's;\(#define LIBXML_ICONV_ENABLED\);\1_DUMMY;' \
  +                        gnulib-local/lib/libxml/xmlversion.in.h \
  +                        gettext-tools/gnulib-lib/libxml/xmlversion.in.h
                       CC="$cc" \
                       GREP="grep" \
                       ./configure \
  @@ .