RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  j...@rpm5.org
  Module: rpm                              Date:   06-Apr-2009 16:15:36
  Branch: HEAD                             Handle: 2009040614153501

  Modified files:
    rpm                     CHANGES
    rpm/rpmio               Makefile.am
    rpm/tools               Makefile.am
  Removed files:
    rpm/rpmio               rpmwget.c

  Log:
    - jbj: rpmwget: move to tools.

  Summary:
    Revision    Changes     Path
    1.2897      +1  -0      rpm/CHANGES
    1.218       +1  -4      rpm/rpmio/Makefile.am
    1.22        +0  -1556   rpm/rpmio/rpmwget.c
    2.120       +5  -1      rpm/tools/Makefile.am
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2896 -r1.2897 CHANGES
  --- rpm/CHANGES       4 Apr 2009 16:37:39 -0000       1.2896
  +++ rpm/CHANGES       6 Apr 2009 14:15:35 -0000       1.2897
  @@ -1,5 +1,6 @@
   
   5.2a3 -> 5.2a4:
  +    - jbj: rpmwget: move to tools.
       - jbj: wire-up RPMTAG_FILEDIGESTALGO. wotta waste to pretend 
"compatible" ...
       - jbj: yaml: add build scriptlet tags for --yaml/--xml display.
       - jbj: yaml: permit --without-syck, add some mac os x AutoFu/gcc 
fiddle-ups.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.217 -r1.218 Makefile.am
  --- rpm/rpmio/Makefile.am     1 Apr 2009 15:11:35 -0000       1.217
  +++ rpm/rpmio/Makefile.am     6 Apr 2009 14:15:36 -0000       1.218
  @@ -16,7 +16,7 @@
   
   EXTRA_PROGRAMS = rpmborg rpmcpio rpmcurl rpmdpkg \
        rpmgenbasedir rpmgenpkglist rpmgensrclist rpmgpg \
  -     rpmpbzip2 rpmpigz rpmtar rpmwget rpmz \
  +     rpmpbzip2 rpmpigz rpmtar rpmz \
        tdir tfts tget tglob thkp thtml tinv tkey tmacro tmagic tmire \
        tput tpw trpmio tsw dumpasn1 lookup3
   
  @@ -276,9 +276,6 @@
   rpmtar_SOURCES = rpmtar.c
   rpmtar_LDADD = $(RPM_LDADD_COMMON)
   
  -rpmwget_SOURCES = rpmwget.c
  -rpmwget_LDADD = $(RPMIO_LDADD_COMMON)
  -
   rpmz_SOURCES = rpmz.c
   rpmz_LDADD = $(RPMIO_LDADD_COMMON)
   
  @@ .
  rm -f rpm/rpmio/rpmwget.c <<'@@ .'
  Index: rpm/rpmio/rpmwget.c
  ============================================================================
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tools/Makefile.am
  ============================================================================
  $ cvs diff -u -r2.119 -r2.120 Makefile.am
  --- rpm/tools/Makefile.am     27 Jan 2009 17:04:45 -0000      2.119
  +++ rpm/tools/Makefile.am     6 Apr 2009 14:15:36 -0000       2.120
  @@ -42,7 +42,8 @@
        $(top_builddir)/build/librpmbuild.la \
        $(RPM_LDADD_COMMON)
   
  -bin_PROGRAMS =               rpm2cpio rpmcache rpmdigest rpmgrep rpmmtree 
rpmrepo rpmspecdump
  +bin_PROGRAMS =               rpm2cpio rpmcache rpmdigest rpmgrep rpmmtree \
  +     rpmrepo rpmspecdump rpmwget
   dist_man_MANS =              rpmgrep.1
   
   pkglibdir =          @USRLIBRPM@
  @@ -76,6 +77,9 @@
   rpmspecdump_SOURCES =        rpmspecdump.c
   rpmspecdump_LDADD =  $(RPMBUILD_LDADD_COMMON)
   
  +rpmwget_SOURCES = rpmwget.c
  +rpmwget_LDADD = $(RPMIO_LDADD_COMMON)
  +
   ##
   ## Traditional rpm2cpio
   ##
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to