RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 07-Jun-2011 17:36:35
Branch: HEAD Handle: 2011060715363401
Modified files:
rpm CHANGES configure.ac
rpm/macros macros.in
Log:
revert latest commit
Summary:
Revision Changes Path
1.3654 +0 -3 rpm/CHANGES
2.498 +0 -16 rpm/configure.ac
1.58 +2 -2 rpm/macros/macros.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3653 -r1.3654 CHANGES
--- rpm/CHANGES 7 Jun 2011 13:09:44 -0000 1.3653
+++ rpm/CHANGES 7 Jun 2011 15:36:34 -0000 1.3654
@@ -12,9 +12,6 @@
- afb: yaml: use !!timestamp for timestamps
5.4.0 -> 5.4.1:
- - devzero2000: define the scriplet_requires macro
- as /bin/bash --rpm-requires only if bash have the
- required patch.
- devzero2000: In fpLookupSubdir, data returned by hash should be of type
"struct rpmffi_s **" instead of "struct rpmffi_s *" to avoid
segfault. Patch by Qing He.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.497 -r2.498 configure.ac
--- rpm/configure.ac 7 Jun 2011 12:35:29 -0000 2.497
+++ rpm/configure.ac 7 Jun 2011 15:36:34 -0000 2.498
@@ -390,22 +390,6 @@
AC_DEFINE([RPMVERCMP_DIGITS_BEAT_ALPHA],[1],[Permit in RPM version
comparison that digits beat alpha])
])
-dnl # Check if bash have the --rpm-requires patch
-dnl # If so define the scriptlet_requires output variable
-dnl # to "bash --rpm-requires"
-dnl # and BASH_RPM_REQUIRES to the bash absolute path
-AC_CACHE_CHECK([for bash if supports --rpm-requires],
[ac_cv_path_BASH_RPM_REQUIRES],
- [AC_PATH_PROGS_FEATURE_CHECK([BASH_RPM_REQUIRES], [bash],
- [[ bash_rpm_requires_out=`echo ls | $ac_path_BASH_RPM_REQUIRES
--rpm-requires | grep "executable(ls)"`
- test "x$bash_rpm_requires_out" != x \
- && ac_cv_path_BASH_RPM_REQUIRES=$ac_path_BASH_RPM_REQUIRES
scriptlet_requires="$ac_path_BASH_RPM_REQUIRES --rpm-requires"
- ]],
- [[ scriptlet_requires="%{nil}" ]], [$PATH]
-)])
-AS_IF([test "x$ac_cv_path_BASH_RPM_REQUIRES" != x],
- [AC_SUBST([BASH_RPM_REQUIRES],[$ac_cv_path_BASH_RPM_REQUIRES])],
- [AC_SUBST([BASH_RPM_REQUIRES],[:])])
-AC_SUBST([scriptlet_requires])
dnl # FIXME: partly Linux-specific only!?
dnl # (but at least it usually doesn't harm on other platforms)
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/macros.in
============================================================================
$ cvs diff -u -r1.57 -r1.58 macros.in
--- rpm/macros/macros.in 7 Jun 2011 12:35:29 -0000 1.57
+++ rpm/macros/macros.in 7 Jun 2011 15:36:35 -0000 1.58
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.57 2011/06/07 12:35:29 devzero2000 Exp $
+# $Id: macros.in,v 1.58 2011/06/07 15:36:35 devzero2000 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
@@ -940,7 +940,7 @@
# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
#%__executable_provides %{_rpmhome}/executabledeps.sh --provides
#%__executable_requires %{_rpmhome}/executabledeps.sh --requires
-%__scriptlet_requires @scriptlet_requires@
+%__scriptlet_requires %{__bash} --rpm-requires
#==============================================================================
# XXX Caveat:
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
