aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--URPM.xs11
-rw-r--r--perl-URPM.spec5
2 files changed, 11 insertions, 5 deletions
diff --git a/URPM.xs b/URPM.xs
index 404675c..349fad6 100644
--- a/URPM.xs
+++ b/URPM.xs
@@ -98,6 +98,11 @@ typedef struct s_Package* URPM__Package;
#define FILTER_MODE_UPGRADE_FILES 1
#define FILTER_MODE_CONF_FILES 2
+/* promote epoch sense should be :
+ 0 for compability with old packages
+ 1 for rpm 4.2 and better new approach. */
+#define PROMOTE_EPOCH_SENSE 1
+
/* these are in rpmlib but not in rpmlib.h */
int readLead(FD_t fd, struct rpmlead *lead);
#ifdef RPM_42
@@ -2812,10 +2817,8 @@ Urpm_ranges_overlap(a, b)
/* now compare epoch */
if (ea && eb)
sense = rpmvercmp(*ea ? ea : "0", *eb ? eb : "0");
- /* if we need to promote, sense is 1 else it is kept as 0
- else if (ea && *ea && atol(ea) > 0)
- sense = 0;
- */
+ else if (ea && *ea && atol(ea) > 0)
+ sense = PROMOTE_EPOCH_SENSE;
else if (eb && *eb && atol(eb) > 0)
sense = -1;
/* now compare version and release if epoch has not been enough */
diff --git a/perl-URPM.spec b/perl-URPM.spec
index 3ee5b7e..cc2ad91 100644
--- a/perl-URPM.spec
+++ b/perl-URPM.spec
@@ -1,7 +1,7 @@
%define name perl-URPM
%define real_name URPM
%define version 0.91
-%define release 1mdk
+%define release 2mdk
%{expand:%%define rpm_version %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' rpm)}
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jun 17 2003 François Pons <fpons@mandrakesoft.com> 0.91-2mdk
+- fixed promotion of epoch to be rpm 4.2 compliant.
+
* Mon Jun 16 2003 François Pons <fpons@mandrakesoft.com> 0.91-1mdk
- added transaction set methods.
- added disable_obsolete flags to improve installation mode of