- treat missing epoch's exactly the same as Epoch: 0.

CVS patchset: 6891
CVS date: 2003/06/03 22:06:27

diff --git a/CHANGES b/CHANGES
index a6fbd48..71ba8f4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,8 @@
        - don't use error string after gzclose (Dmitry V. Levin).
        - fix: nested %if handling, optind initialization posix vs. glibc.
        - add version check for package with provides and obsoletes.
+       - x86_64 -> athlon, ppc64[ip]series -> ppc64 arch compatibility.
+       - treat missing epoch's exactly the same as Epoch: 0.
 
 4.1 -> 4.2:
        - set cachesize without a dbenv, the default is far too small.

diff --git a/lib/rpmds.c b/lib/rpmds.c
index 78cc7da..2677e20 100644 (file)
--- a/lib/rpmds.c
+++ b/lib/rpmds.c
@@ -167,7 +167,7 @@ rpmds rpmdsNew(Header h, rpmTag tagN, int scareMem)
        ds->N = N;
        ds->Nt = Nt;
        ds->Count = Count;
-       ds->nopromote = 0;
+       ds->nopromote = _rpmds_nopromote;
 
        xx = hge(h, tagEVR, &ds->EVRt, (void **) &ds->EVR, NULL);
        xx = hge(h, tagF, &ds->Ft, (void **) &ds->Flags, NULL);

diff --git a/rpm.spec.in b/rpm.spec.in
index fa2e415..2bdd7d2 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -36,7 +36,7 @@ BuildRequires: elfutils-libelf
 
 BuildRequires: zlib-devel
 
-BuildRequires: beecrypt >= 0:3.0.0-0.20030529
+BuildRequires: beecrypt-devel >= 0:3.0.0-0.20030603
 
 # XXX Red Hat 5.2 has not bzip2 or python
 %if %{with_bzip2}