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: 31-Oct-2010 17:17:21
Branch: rpm-5_3 Handle: 2010103116172001
Modified files: (Branch: rpm-5_3)
rpm CHANGES
rpm/rpmdb rpmevr.c
Log:
mandriva: fix 'Conflicts: dependencies without release misfire'.
(mdvbz#55810)
Summary:
Revision Changes Path
1.3296.2.109+2 -0 rpm/CHANGES
1.36.2.1 +6 -0 rpm/rpmdb/rpmevr.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3296.2.108 -r1.3296.2.109 CHANGES
--- rpm/CHANGES 31 Oct 2010 16:16:20 -0000 1.3296.2.108
+++ rpm/CHANGES 31 Oct 2010 16:17:20 -0000 1.3296.2.109
@@ -1,4 +1,6 @@
5.3.5 -> 5.3.6:
+ - proyvind: mandriva: fix 'Conflicts: dependencies without release
+ misfire'. (mdvbz#55810)
- proyvind: make sure to expand %buildroot from main package.
- jbj: devtool: don't distribute internal pcre.
- proyvind: filetriggers: don't bother w unneeded chroot.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmevr.c
============================================================================
$ cvs diff -u -r1.36 -r1.36.2.1 rpmevr.c
--- rpm/rpmdb/rpmevr.c 6 Mar 2010 16:20:46 -0000 1.36
+++ rpm/rpmdb/rpmevr.c 31 Oct 2010 16:17:21 -0000 1.36.2.1
@@ -277,6 +277,12 @@
for (s = rpmEVRorder(); *s != '\0'; s++) {
int ix;
+#if defined(RPM_VENDOR_MANDRIVA) /* mdvbz#55810 */
+ if(*s == 'R' && (b->Flags & (~RPMSENSE_GREATER & RPMSENSE_EQUAL))
+ && *(b->F[RPMEVR_R]) == '\0')
+ break;
+#endif
+
switch ((int)*s) {
default: continue; /*...@notreached@*/
/*...@switchbreak@*/break;
case 'E': ix = RPMEVR_E; /*...@switchbreak@*/break;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
