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

  Server: rpm5.org                         Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs                       Email:  pkarlsen@rpm5.org
  Module: rpm                              Date:   16-Dec-2007 23:28:10
  Branch: rpm-4_5                          Handle: 2007121622280900

  Modified files:           (Branch: rpm-4_5)
    rpm                     CHANGES
    rpm/build               pack.c

  Log:
    add back SOURCEPACKAGE tag for Mandriva to allow packages to be
    rebuilt on older releases

  Summary:
    Revision    Changes     Path
    1.1360.2.60 +5  -4      rpm/CHANGES
    2.212.2.3   +7  -0      rpm/build/pack.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1360.2.59 -r1.1360.2.60 CHANGES
  --- rpm/CHANGES	16 Dec 2007 22:22:33 -0000	1.1360.2.59
  +++ rpm/CHANGES	16 Dec 2007 22:28:09 -0000	1.1360.2.60
  @@ -1,18 +1,19 @@
   4.4.9 -> 4.5:
  -    - proyvind: Add back rpm v3 format support for Mandriva
  -    - proyvind: Rename rpmcliImportPubkey() -> rpmtsImportPubkey() (from and for rpm.org compatibility)
  +    - proyvind: add back SOURCEPACKAGE tag for Mandriva to allow packages to be rebuilt on older releases
  +    - proyvind: add back rpm v3 format support for Mandriva
  +    - proyvind: rename rpmcliImportPubkey() -> rpmtsImportPubkey() (from and for rpm.org compatibility)
       - proyvind: expose more functions in rpmps API (as rpm.org, initially based on us ;p)
       - proyvind: fix built-in zlib dependencies (from gb)
       - proyvind: force generation of PIC code for static libs that can be built into a DSO (zlib, file) (from gb)
       - proyvind: make rpm -bb --quiet" quiet as should be (from pixel)
       - proyvind: do check free size when bavail is 0 (from pixel)
       - proyvind: allow to set %_srcdefattr for src.rpm (from pixel)
  -    - proyvind: Check amd64 vs x86_64, they're the same arch (from Gwenole Beauchesne/gb)
  +    - proyvind: check amd64 vs x86_64, they're the same arch (from Gwenole Beauchesne/gb)
       - proyvind: do not crash when FILELINKTOS has more entries than DIRNAMES (from pixel)
       - proyvind: fix parse_hdlist (and so genhdlist2) on heavy loaded boxes for Mandriva (from pixel)
       - proyvind: fix diff issue when buildroot contains some "//" (from Nanar)
       - proyvind: avoid taking into account duplicates in file list when checking for unpackaged files
  -    - proyvind: Install perl module in vendor directory (from Rafael Garcia-Suarez/rgs)
  +    - proyvind: install perl module in vendor directory (from Rafael Garcia-Suarez/rgs)
       - proyvind: add some extra functionality to gendiff (from Frederic Lepied/flepied)
       - proyvind: fix segfault for old packages with postin, but no postinprog (from pixel)
       - proyvind: fix rpm -K segfaulting on corrupted header (from pixel)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/pack.c
  ============================================================================
  $ cvs diff -u -r2.212.2.2 -r2.212.2.3 pack.c
  --- rpm/build/pack.c	9 Dec 2007 04:13:41 -0000	2.212.2.2
  +++ rpm/build/pack.c	16 Dec 2007 22:28:09 -0000	2.212.2.3
  @@ -957,6 +957,9 @@
   {
       struct cpioSourceArchive_s csabuf;
       CSA_t csa = &csabuf;
  +#if defined(RPM_VENDOR_MANDRIVA)
  +    int_32 one = 1;
  +#endif
       int rc;
   
       /* Add some cruft */
  @@ -966,6 +969,10 @@
   		   RPM_STRING_TYPE, buildHost(), 1);
       (void) headerAddEntry(spec->sourceHeader, RPMTAG_BUILDTIME,
   		   RPM_INT32_TYPE, getBuildTime(), 1);
  +#if defined(RPM_VENDOR_MANDRIVA)    
  +    (void) headerAddEntry(spec->sourceHeader, RPMTAG_SOURCEPACKAGE, 
  +            RPM_INT32_TYPE, &one, 1);
  +#endif
   
       (void) genSourceRpmName(spec);
   
  @@ .