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: 04-May-2009 18:39:06 Branch: HEAD Handle: 2009050416390500 Modified files: rpm CHANGES macros.in Log: get rid of parallel %___NVRDA macro, just merge it with %___NVRA in stead. Summary: Revision Changes Path 1.2969 +1 -0 rpm/CHANGES 1.282 +3 -6 rpm/macros.in ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.2968 -r1.2969 CHANGES --- rpm/CHANGES 3 May 2009 17:35:58 -0000 1.2968 +++ rpm/CHANGES 4 May 2009 16:39:05 -0000 1.2969 @@ -1,5 +1,6 @@ 5.2a4 -> 5.2b1: + - proyvind: get rid of parallel %___NVRDA macro, just merge it with %___NVRA in stead. - jbj: add RPMSENSE_RPMLIB to new tracking dependencies. at least its consistent even if useless. - jbj: fix: rpmdsMerge() shouldn't leave a result that seems to have @@ . patch -p0 <<'@@ .' Index: rpm/macros.in ============================================================================ $ cvs diff -u -r1.281 -r1.282 macros.in --- rpm/macros.in 4 Apr 2009 16:37:39 -0000 1.281 +++ rpm/macros.in 4 May 2009 16:39:05 -0000 1.282 @@ -1,7 +1,7 @@ #/*! \page config_macros Default configuration: @USRLIBRPM@/macros # \verbatim # -# $Id: macros.in,v 1.281 2009/04/04 16:37:39 jbj Exp $ +# $Id: macros.in,v 1.282 2009/05/04 16:39:05 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 @@ -861,7 +861,7 @@ # binary packages. # # XXX Note: escaped %% for use in headerSprintf() -%_build_name_fmt %%{ARCH}/%{___NVRDA}.rpm +%_build_name_fmt %%{ARCH}/%{___NVRA}.rpm # The default transaction color. This value is a set of bits to # determine file and dependency affinity for this arch. @@ -1011,10 +1011,7 @@ # ---- Query macros. # # Default query format string for displaying package names everywhere -%___NVRA %%{NAME}-%%{VERSION}-%%{RELEASE}%%|ARCH?{.%%|SOURCERPM?{%%{ARCH}}:{src}|}:{}| - -# Format string including DistTag & DistEpoch if defined -%___NVRDA %%{NAME}-%%{VERSION}-%%{RELEASE}%%|DISTTAG?{-%%{DISTTAG}%%|DISTEPOCH?{%%{DISTEPOCH}}|}|%%|ARCH?{.%%|SOURCERPM?{%%{ARCH}}:{src}|}:{}| +%___NVRA %%{NAME}-%%{VERSION}-%%{RELEASE}%%|DISTTAG?{-%%{DISTTAG}%%|DISTEPOCH?{%%{DISTEPOCH}}|}|%%|ARCH?{.%%|SOURCERPM?{%%{ARCH}}:{src}|}:{}| # Default headerSprintf() output format string for rpm -qa @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
