rpms/fedora-rpmdevtools/devel fedora-rpmdevtools-cpw-bash31.patch, NONE, 1.1 fedora-rpmdevtools.spec, 1.14, 1.15
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Sat Feb 4 16:49:41 UTC 2006
Author: scop
Update of /cvs/extras/rpms/fedora-rpmdevtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8454
Modified Files:
fedora-rpmdevtools.spec
Added Files:
fedora-rpmdevtools-cpw-bash31.patch
Log Message:
* Sat Feb 4 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4-2
- Fix rpath checker tests with bash 3.1 (#178636, Enrico Scholz).
fedora-rpmdevtools-cpw-bash31.patch:
--- NEW FILE fedora-rpmdevtools-cpw-bash31.patch ---
--- fedora-rpmdevtools-1.4/check-rpaths-worker.ifs 2005-10-15 21:48:11.000000000 +0200
+++ fedora-rpmdevtools-1.4/check-rpaths-worker 2006-02-04 13:41:51.182579267 +0100
@@ -18,7 +18,6 @@
fail=
-IFS=:
already_shown=0
# effect of this expression is obviously:
@@ -97,13 +96,16 @@
}
: ${QA_RPATHS:=0}
+old_IFS=$IFS
for i; do
pos=0
rpath=$(readelf -d "$i" 2>/dev/null | LANG=C grep '(RPATH).*:') || continue
rpath=$(echo "$rpath" | LANG=C sed -e 's!.*(RPATH).*: \[\(.*\)\]!\1!p;d')
tmp=aux:$rpath:/lib/aux || :
+ IFS=:
set -- $tmp
+ IFS=$old_IFS
shift
allow_ORIGIN=1
Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/fedora-rpmdevtools.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fedora-rpmdevtools.spec 30 Dec 2005 17:47:27 -0000 1.14
+++ fedora-rpmdevtools.spec 4 Feb 2006 16:49:41 -0000 1.15
@@ -4,7 +4,7 @@
Name: fedora-rpmdevtools
Version: 1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Fedora RPM Development Tools
Group: Development/Tools
@@ -13,6 +13,7 @@
# rpminfo upstream: http://people.redhat.com/twoerner/rpminfo/bin/
Source0: %{name}-%{version}.tar.bz2
Source1: http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2
+Patch0: %{name}-cpw-bash31.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -46,6 +47,7 @@
%prep
%setup -q -a 1
+%patch0 -p1
cp -p spectool*/README README.spectool
@@ -127,6 +129,9 @@
%changelog
+* Sat Feb 4 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4-2
+- Fix rpath checker tests with bash 3.1 (#178636, Enrico Scholz).
+
* Fri Dec 30 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.4-1
- Update spectool to 1.0.6 (#176521).
More information about the fedora-extras-commits
mailing list