RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 28-Feb-2010 13:59:44 Branch: rpm-5_2 Handle: 2010022812594301 Modified files: (Branch: rpm-5_2) rpm CHANGES macros.in Log: add a %EVRD macro for use with versioned provides/requires to automatically add all the tags used for version comparison. Summary: Revision Changes Path 1.2970.2.47 +2 -0 rpm/CHANGES 1.282.2.4 +6 -1 rpm/macros.in ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.2970.2.46 -r1.2970.2.47 CHANGES --- rpm/CHANGES 28 Feb 2010 03:19:36 -0000 1.2970.2.46 +++ rpm/CHANGES 28 Feb 2010 12:59:43 -0000 1.2970.2.47 @@ -1,4 +1,6 @@ 5.2.0 -> 5.2.1: + - proyvind: add a %EVRD macro for use with versioned provides/requires to + automatically add all the tags used for version comparison. - proyvind: python: make sure that we always use our own rpm build and macros. - proyvind: filetriggers: don't pass filename as argument to scripts, @@ . patch -p0 <<'@@ .' Index: rpm/macros.in ============================================================================ $ cvs diff -u -r1.282.2.3 -r1.282.2.4 macros.in --- rpm/macros.in 21 May 2009 16:29:58 -0000 1.282.2.3 +++ rpm/macros.in 28 Feb 2010 12:59:44 -0000 1.282.2.4 @@ -1,7 +1,7 @@ #/*! \page config_macros Default configuration: @USRLIBRPM@/macros # \verbatim # -# $Id: macros.in,v 1.282.2.3 2009/05/21 16:29:58 jbj Exp $ +# $Id: macros.in,v 1.282.2.4 2010/02/28 12:59:44 pkarlsen 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 @@ -1041,6 +1041,11 @@ %_uuid_auth http://rpm5.org/ %_uuid_path /package +# +# Dynamic EVRD tags macro for use with versioned provides/requires in place of +# '%{version}-%{release}', ie. to automatically add distepoch or epoch if present +%EVRD %{?epoch:%{epoch}:}%{?version:%{version}}%{?release:-%{release}}%{?distepoch::%{distepoch}} + #============================================================================== # ---- EVRD... dependency tuple comparison macros. # @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
