RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 30-May-2012 20:15:59
Branch: rpm-5_4 Handle: 2012053018155800
Modified files: (Branch: rpm-5_4)
rpm/macros macros.in
Log:
- rpmevr: fix: pattern with twiddle-in-version incorrect.
Summary:
Revision Changes Path
1.39.2.35 +2 -2 rpm/macros/macros.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/macros/macros.in
============================================================================
$ cvs diff -u -r1.39.2.34 -r1.39.2.35 macros.in
--- rpm/macros/macros.in 29 May 2012 17:42:28 -0000 1.39.2.34
+++ rpm/macros/macros.in 30 May 2012 18:15:58 -0000 1.39.2.35
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.39.2.34 2012/05/29 17:42:28 jbj Exp $
+# $Id: macros.in,v 1.39.2.35 2012/05/30 18:15:58 jbj Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -755,7 +755,7 @@
# STEP 1: Match the string and capture regex parts
# 1 2 3 4 5
# X ":" X "~"X "-"X ":"X
-%evr_tuple_match
^(?:([^:-]+):)?([^:-~]+)(?~([^:-]+))?(?:-([^:-]+))?(?::([^:-]+))?$
+%evr_tuple_match
^(?:([^:-]+):)?([^:~-]+)(?:~([^:-]+))?(?:-([^:-]+))?(?::([^:-]+))?$
# STEP 2: Assemble <E,V,T,R,D> tuple from regex parts (11 cases)
# X:X~X-X:X 12345
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
