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: 28-Feb-2010 13:57:37
Branch: HEAD Handle: 2010022812573601
Modified files:
rpm CHANGES
rpm/macros macros.rpmbuild.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.3277 +2 -0 rpm/CHANGES
1.2 +6 -1 rpm/macros/macros.rpmbuild.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3276 -r1.3277 CHANGES
--- rpm/CHANGES 28 Feb 2010 03:20:39 -0000 1.3276
+++ rpm/CHANGES 28 Feb 2010 12:57:36 -0000 1.3277
@@ -1,5 +1,7 @@
5.2b1 -> 5.3a1
+ - 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/macros.rpmbuild.in
============================================================================
$ cvs diff -u -r1.1 -r1.2 macros.rpmbuild.in
--- rpm/macros/macros.rpmbuild.in 21 Aug 2009 19:17:31 -0000 1.1
+++ rpm/macros/macros.rpmbuild.in 28 Feb 2010 12:57:37 -0000 1.2
@@ -1,7 +1,7 @@
#/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
# \verbatim
#
-# $Id: macros.rpmbuild.in,v 1.1 2009/08/21 19:17:31 jbj Exp $
+# $Id: macros.rpmbuild.in,v 1.2 2010/02/28 12:57:37 pkarlsen Exp $
#
# This file contains rpmbuild configuration macros.
#
@@ -277,6 +277,11 @@
# XXX Note: escaped %% for use in headerSprintf()
%_build_name_fmt %%{ARCH}/%{___NVRA}.rpm
+#
+# 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}}
+
#==============================================================================
# ---- per-platform macros.
# Macros that are specific to an individual platform. The values here
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
