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 14:38:04 Branch: rpm-5_2 Handle: 2010022813380400 Modified files: (Branch: rpm-5_2) rpm CHANGES macros.in Log: cowardly back out %EVRD per jbj's objections Summary: Revision Changes Path 1.2970.2.48 +0 -2 rpm/CHANGES 1.282.2.5 +0 -5 rpm/macros.in ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.2970.2.47 -r1.2970.2.48 CHANGES --- rpm/CHANGES 28 Feb 2010 12:59:43 -0000 1.2970.2.47 +++ rpm/CHANGES 28 Feb 2010 13:38:04 -0000 1.2970.2.48 @@ -1,6 +1,4 @@ 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.4 -r1.282.2.5 macros.in --- rpm/macros.in 28 Feb 2010 12:59:44 -0000 1.282.2.4 +++ rpm/macros.in 28 Feb 2010 13:38:04 -0000 1.282.2.5 @@ -1,7 +1,7 @@ #/*! \page config_macros Default configuration: @USRLIBRPM@/macros # \verbatim # -# $Id: macros.in,v 1.282.2.4 2010/02/28 12:59:44 pkarlsen Exp $ +# $Id: macros.in,v 1.282.2.5 2010/02/28 13:38:04 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,11 +1041,6 @@ %_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]
