RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 04-Oct-2008 21:36:27
Branch: rpm-5_1 Handle: 2008100419362600
Modified files: (Branch: rpm-5_1)
rpm CHANGES macros.in
Log:
- jbj: use macro, not /bin/bash, in scriptlet_requires.
Summary:
Revision Changes Path
1.2288.2.122+1 -0 rpm/CHANGES
1.241.2.4 +2 -2 rpm/macros.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2288.2.121 -r1.2288.2.122 CHANGES
--- rpm/CHANGES 4 Oct 2008 18:13:42 -0000 1.2288.2.121
+++ rpm/CHANGES 4 Oct 2008 19:36:26 -0000 1.2288.2.122
@@ -1,4 +1,5 @@
5.1.4 -> 5.1.5:
+ - jbj: use macro, not /bin/bash, in scriptlet_requires.
- jbj: don't run empty transactions, avoiding obscure error msg.
- jbj: permit a negative index as alias for the last problem added to
set.
- jbj: warn if package is not added because of platform affinity
patterns.
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros.in
============================================================================
$ cvs diff -u -r1.241.2.3 -r1.241.2.4 macros.in
--- rpm/macros.in 21 Aug 2008 12:43:13 -0000 1.241.2.3
+++ rpm/macros.in 4 Oct 2008 19:36:26 -0000 1.241.2.4
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.241.2.3 2008/08/21 12:43:13 jbj Exp $
+# $Id: macros.in,v 1.241.2.4 2008/10/04 19:36:26 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
@@ -1611,7 +1611,7 @@
# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
#%__executable_provides %{_rpmhome}/executabledeps.sh --provides
#%__executable_requires %{_rpmhome}/executabledeps.sh --requires
-%__scriptlet_requires /bin/bash --rpm-requires
+%__scriptlet_requires %{__bash} --rpm-requires
# \endverbatim
#*/
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
