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:   09-Feb-2008 10:04:52
  Branch: HEAD                             Handle: 2008020909045200

  Modified files:
    rpm                     CHANGES
    rpm/rpmio               Makefile.am

  Log:
    unbreak regular build procedure by backing out recent change which
    breaks the library dependency hierarchy

  Summary:
    Revision    Changes     Path
    1.2160      +0  -1      rpm/CHANGES
    1.123       +2  -7      rpm/rpmio/Makefile.am
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2159 -r1.2160 CHANGES
  --- rpm/CHANGES	9 Feb 2008 02:54:49 -0000	1.2159
  +++ rpm/CHANGES	9 Feb 2008 09:04:52 -0000	1.2160
  @@ -4,7 +4,6 @@
   	no pesky trailing /).
       - jbj: rpmdav: fix: supply davOpendir->davHEAD a statbuf to avoid tdir/tfts
   	segfaults on plain http. (only . and .. in directory).
  -    - jbj: tie tget/tdir/tglob/tfts to a rpmio "make check". much more to do ...
       - jbj: tweak up tglob debugging spew, add a Glob(3) stopwatch.
       - jbj: tweak up tget debugging spew, trick in a Stat(2) on path,
   	add Stat(2)/Fread(3) stopwatches, display same as "ls -island" output.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.122 -r1.123 Makefile.am
  --- rpm/rpmio/Makefile.am	8 Feb 2008 22:20:03 -0000	1.122
  +++ rpm/rpmio/Makefile.am	9 Feb 2008 09:04:52 -0000	1.123
  @@ -4,14 +4,9 @@
   
   LINT = splint
   
  -EXTRA_DIST = gengpg.sh thkp.c tput.c tinv.c tkey.c trpmio.c lookup3.c tpw.c librpmio.vers
  +EXTRA_DIST = gengpg.sh tdir.c tfts.c tget.c thkp.c tput.c tglob.c tinv.c tkey.c trpmio.c lookup3.c tpw.c librpmio.vers
   
  -EXTRA_PROGRAMS = thkp tinv tkey tmacro tmagic tmire tput tpw trpmio tsw dumpasn1 lookup3
  -
  -noinst_PROGRAMS = tdir tfts tget tglob
  -noinst_SCRIPTS = testit.sh
  -
  -TESTS = testit.sh
  +EXTRA_PROGRAMS = tdir tfts tget tglob thkp tinv tkey tmacro tmagic tmire tput tpw trpmio tsw dumpasn1 lookup3
   
   AM_CPPFLAGS = \
   	-I$(srcdir) \
  @@ .