RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 14-May-2009 12:57:20
Branch: rpm-5_2 Handle: 2009051410572000
Modified files: (Branch: rpm-5_2)
rpm CHANGES
rpm/build pack.c
Log:
remove %distepoch from %provideversion as it will break compatibility
with rpm <= 4.5.
Summary:
Revision Changes Path
1.2970.2.8 +2 -0 rpm/CHANGES
2.310.2.1 +0 -16 rpm/build/pack.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2970.2.7 -r1.2970.2.8 CHANGES
--- rpm/CHANGES 14 May 2009 10:53:06 -0000 1.2970.2.7
+++ rpm/CHANGES 14 May 2009 10:57:20 -0000 1.2970.2.8
@@ -1,5 +1,7 @@
5.2a4 -> 5.2b1:
+ - proyvind: remove %distepoch from %provideversion as it will break
+ compatibility with rpm <= 4.5.
- proyvind: rpm4compat: add a wrapper function for headerFormat().
- jbj: mire: handle items from _mirePool like all other pools.
- jbj: rpmds: dereference/flush global items earlier, before pool
teardown.
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/pack.c
============================================================================
$ cvs diff -u -r2.310 -r2.310.2.1 pack.c
--- rpm/build/pack.c 26 Mar 2009 18:07:31 -0000 2.310
+++ rpm/build/pack.c 14 May 2009 10:57:20 -0000 2.310.2.1
@@ -453,10 +453,6 @@
{
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
const char *N, *V, *R;
-#ifdef RPM_VENDOR_MANDRIVA
- const char *D;
- int gotD;
-#endif
rpmuint32_t E;
int gotE;
const char *pEVR;
@@ -477,12 +473,6 @@
return;
nb = 21 + strlen(V) + 1 + strlen(R) + 1;
-#ifdef RPM_VENDOR_MANDRIVA
- he->tag = RPMTAG_DISTEPOCH;
- gotD = headerGet(h, he, 0);
- D = (he->p.str ? he->p.str : NULL);
- nb += (gotD ? strlen(D) + 1 : 0);
-#endif
pEVR = p = alloca(nb);
*p = '\0';
he->tag = RPMTAG_EPOCH;
@@ -494,12 +484,6 @@
p += strlen(p);
}
p = stpcpy( stpcpy( stpcpy(p, V) , "-") , R);
-#ifdef RPM_VENDOR_MANDRIVA
- if (gotD) {
- p = stpcpy( stpcpy( p, ":"), D);
- D = _free(D);
- }
-#endif
V = _free(V);
R = _free(R);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
