RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 20-Apr-2011 17:57:00
Branch: rpm-5_4 Handle: 2011042015565901
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/rpmdb rpmevr.c
Log:
permit in configure phase to
--enable-rpmvercmp-digits-beat-alpha for reverting to the old rpmvercmp
behavior where digits beat alpha as used by Mandriva, Fedora, Suse
and other (ref
https://blueprints.launchpad.net/rpm/+spec/rpm-split-vendor-config-in-autofu)
Summary:
Revision Changes Path
1.3501.2.118+4 -0 rpm/CHANGES
2.472.2.15 +13 -0 rpm/configure.ac
1.37.2.2 +1 -1 rpm/rpmdb/rpmevr.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.117 -r1.3501.2.118 CHANGES
--- rpm/CHANGES 20 Apr 2011 10:57:41 -0000 1.3501.2.117
+++ rpm/CHANGES 20 Apr 2011 15:56:59 -0000 1.3501.2.118
@@ -1,4 +1,8 @@
5.4.0 -> 5.4.1:
+ - devzero2000: permit in configure phase to
+ --enable-rpmvercmp-digits-beat-alpha for reverting to the old
rpmvercmp
+ behavior where digits beat alpha as used by Mandriva, Fedora, Suse
+ and other (ref
https://blueprints.launchpad.net/rpm/+spec/rpm-split-vendor-config-in-autofu)
- jbj: mongo: adjust --json spewage to accomodate mongo syntax.
- devzero2000: get rid of rindex everywhere: use SUSv3 strrchr instead
- jbj: mongo: templating diddle-ups, use new Date(...) in other.mongo.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.472.2.14 -r2.472.2.15 configure.ac
--- rpm/configure.ac 10 Apr 2011 10:54:19 -0000 2.472.2.14
+++ rpm/configure.ac 20 Apr 2011 15:56:59 -0000 2.472.2.15
@@ -377,6 +377,19 @@
])
+dnl # Permit to revert to the old rpmvercmp behavior where digits beat alpha
+dnl # called in VENDOR old-comparision-behaviour
+AC_ARG_ENABLE(
+ [rpmvercmp-digits-beat-alpha],
+ AS_HELP_STRING([--enable-rpmvercmp-digits-beat-alpha],[Permit in RPM
version comparison that digits beat alpha (default:no)]),
+ [ do_rpmvercmp_digits_beat_alpha=$enableval ],
+ [ do_rpmvercmp_digits_beat_alpha=no ])
+
+AS_IF([test "x$do_rpmvercmp_digits_beat_alpha" != xno],
+ [
+ AC_DEFINE([RPMVERCMP_DIGITS_BEAT_ALPHA],[1],[Permit in RPM version
comparison that digits beat alpha])
+ ])
+
dnl # FIXME: partly Linux-specific only!?
dnl # (but at least it usually doesn't harm on other platforms)
CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT"
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmevr.c
============================================================================
$ cvs diff -u -r1.37.2.1 -r1.37.2.2 rpmevr.c
--- rpm/rpmdb/rpmevr.c 17 Jan 2011 11:27:55 -0000 1.37.2.1
+++ rpm/rpmdb/rpmevr.c 20 Apr 2011 15:57:00 -0000 1.37.2.2
@@ -48,7 +48,7 @@
/* XXX Force digits to beat alphas. See bugzilla #50977. */
/*@unchecked@*/
-#if defined(RPM_VENDOR_MANDRIVA) /* old-comparision-behaviour */
+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPMVERCMP_DIGITS_BEAT_ALPHA) /*
old-comparision-behaviour */
static int _invert_digits_alphas_comparison = -1;
#else
static int _invert_digits_alphas_comparison = 1;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
