RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 02-Jan-2008 11:26:04
Branch: HEAD Handle: 2008010210260400
Modified files:
rpm VENDOR
rpm/build pack.c
Log:
For OpenPKG, still mark SRPMS with RPMTAG_SOURCEPACKAGE.
Background: for backward compatibility with RPM < 4.4.6 (remember:
OpenPKG used RPM 4.2.1 until 2008) let RPM 5 still mark SRPMS with
RPMTAG_SOURCEPACKAGE. This especially allows OpenPKG to smoothly upgrade
the "openpkg" package (which contains RPM) from the RPM 4 to the RPM 5
world order. Without this the upgrade procedure would involve manual
"rpm2cpio" plus "rpm -bb" operations.
Summary:
Revision Changes Path
2.24 +12 -0 rpm/VENDOR
2.281 +13 -0 rpm/build/pack.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/VENDOR
============================================================================
$ cvs diff -u -r2.23 -r2.24 VENDOR
--- rpm/VENDOR 1 Jan 2008 20:52:22 -0000 2.23
+++ rpm/VENDOR 2 Jan 2008 10:26:04 -0000 2.24
@@ -358,6 +358,18 @@
--qf '[...]' [-a] [...]" directly from within Lua.
________________________________________________________________________
+ Change: backward-compat-rpmtag-sourcepackage */
+ Purpose: Still mark SRPMS with RPMTAG_SOURCEPACKAGE
+ Reason: For backward compatibility with RPM < 4.4.6
+ (remember: OpenPKG used RPM 4.2.1 until 2008) let
+ RPM 5 still mark SRPMS with RPMTAG_SOURCEPACKAGE.
+ This especially allows OpenPKG to smoothly upgrade
+ the "openpkg" package (which contains RPM) from the
+ RPM 4 to the RPM 5 world order. Without this the
+ upgrade procedure would involve manual "rpm2cpio"
+ plus "rpm -bb" operations.
+ ________________________________________________________________________
+
o Name: RPM4DARWIN
Vendor: RPM for Darwin (Mac OS X)
<http://rpm4darwin.sourceforge.net/>
Representative: Anders F. Bjorklund <[EMAIL PROTECTED]> <[EMAIL
PROTECTED]>
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/pack.c
============================================================================
$ cvs diff -u -r2.280 -r2.281 pack.c
--- rpm/build/pack.c 23 Dec 2007 01:56:40 -0000 2.280
+++ rpm/build/pack.c 2 Jan 2008 10:26:04 -0000 2.281
@@ -1111,9 +1111,22 @@
CSA_t csa = &csabuf;
rpmRC rc;
int xx;
+#if defined(RPM_VENDOR_OPENPKG) /* backward-compat-rpmtag-sourcepackage */
+ uint32_t val;
+#endif
/* Add rpmlib markers for tracking. */
(void) rpmlibMarkers(spec->sourceHeader);
+
+#if defined(RPM_VENDOR_OPENPKG) /* backward-compat-rpmtag-sourcepackage */
+ /* Mark package as a SRPM for backward compatibility with RPM < 4.4.6 */
+ he->tag = RPMTAG_SOURCEPACKAGE;
+ he->t = RPM_UINT32_TYPE;
+ val = 1;
+ he->p.ui32p = &val;
+ he->c = 1;
+ xx = headerPut(spec->sourceHeader, he, 0);
+#endif
(void) genSourceRpmName(spec);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
