fedora-rpmdevtools check-rpaths-worker, 1.7, 1.8 fedora-rpmdevtools.spec, 1.85, 1.86

[Ville Skytta (scop)]

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8397

Modified Files:
	check-rpaths-worker fedora-rpmdevtools.spec 
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).



Index: check-rpaths-worker
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/check-rpaths-worker,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- check-rpaths-worker	15 Oct 2005 19:48:11 -0000	1.7
+++ check-rpaths-worker	4 Feb 2006 16:48:40 -0000	1.8
@@ -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/fedora/fedora-rpmdevtools/fedora-rpmdevtools.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- fedora-rpmdevtools.spec	30 Dec 2005 17:32:57 -0000	1.85
+++ fedora-rpmdevtools.spec	4 Feb 2006 16:48:40 -0000	1.86
@@ -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).