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:35:33
Branch: HEAD Handle: 2008100419353201
Modified files:
rpm CHANGES macros.in
Log:
- jbj: use macro, not /bin/bash, in scriptlet_requires.
Summary:
Revision Changes Path
1.2585 +1 -0 rpm/CHANGES
1.254 +2 -2 rpm/macros.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2584 -r1.2585 CHANGES
--- rpm/CHANGES 4 Oct 2008 18:12:35 -0000 1.2584
+++ rpm/CHANGES 4 Oct 2008 19:35:32 -0000 1.2585
@@ -1,5 +1,6 @@
5.1.0 -> 5.2a0:
+ - 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.253 -r1.254 macros.in
--- rpm/macros.in 21 Aug 2008 12:42:52 -0000 1.253
+++ rpm/macros.in 4 Oct 2008 19:35:33 -0000 1.254
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.253 2008/08/21 12:42:52 jbj Exp $
+# $Id: macros.in,v 1.254 2008/10/04 19:35:33 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
@@ -1646,7 +1646,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]
