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

  Server: rpm5.org                         Name:   Anders F. Björklund
  Root:   /v/rpm/cvs                       Email:  [EMAIL PROTECTED]
  Module: rpm                              Date:   16-Apr-2008 19:54:51
  Branch: rpm-5_1                          Handle: 2008041617545001

  Modified files:           (Branch: rpm-5_1)
    rpm                     CHANGES
    rpm/rpmio               Makefile.am

  Log:
    fix parallel build (backported)

  Summary:
    Revision    Changes     Path
    1.2288.2.12 +1  -0      rpm/CHANGES
    1.162.2.1   +1  -1      rpm/rpmio/Makefile.am
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2288.2.11 -r1.2288.2.12 CHANGES
  --- rpm/CHANGES       16 Apr 2008 17:49:41 -0000      1.2288.2.11
  +++ rpm/CHANGES       16 Apr 2008 17:54:50 -0000      1.2288.2.12
  @@ -1,5 +1,6 @@
   
   5.1.0 -> 5.1.1:
  +    - afb: fix parallel build of rpmdigest (automake quirk)
       - jbj: rpmte: revert to individual tags instead of RPMTAG_NVRA.
       - afb: macosx: fix thinko in previous xar linking workaround
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.162 -r1.162.2.1 Makefile.am
  --- rpm/rpmio/Makefile.am     2 Apr 2008 08:41:05 -0000       1.162
  +++ rpm/rpmio/Makefile.am     16 Apr 2008 17:54:51 -0000      1.162.2.1
  @@ -31,7 +31,7 @@
        @WITH_XAR_CPPFLAGS@
   
   RPMIO_LDADD_COMMON = \
  -     $(top_builddir)/rpmio/librpmio.la \
  +     librpmio.la \
        $(top_builddir)/misc/librpmmisc.la \
        @LTLIBINTL@
   
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to