diff --git a/debugsource-package.diff b/debugsource-package.diff index 775fcb2..ec03d43 100644 --- a/debugsource-package.diff +++ b/debugsource-package.diff @@ -40,9 +40,9 @@ Index: b/scripts/find-debuginfo.sh $strict || strict_error=WARNING -# Strip ELF binaries --find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) -print 0 | sort | +-find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) -print 0 | sort -z | +# Strip ELF binaries (and no static libraries) -+find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) ! -name "*.a" -print0 | sort | ++find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) ! -name "*.a" -print0 | sort -z | xargs --no-run-if-empty -0 stat -c '%h %D_%i %n' | while read nlinks inum f; do case $(objdump -h $f 2>/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)') in diff --git a/finddebuginfo.diff b/finddebuginfo.diff index d32d5b6..9cfe956 100644 --- a/finddebuginfo.diff +++ b/finddebuginfo.diff @@ -45,7 +45,7 @@ Index: scripts/find-debuginfo.sh - -print | -file -N -f - | sed -n -e 's/^\(.*\):[ ]*.*ELF.*, not stripped/\1/p' | -xargs --no-run-if-empty stat -c '%h %D_%i %n' | -+find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) -print 0 | sort | ++find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) -print 0 | sort -z | +xargs --no-run-if-empty -0 stat -c '%h %D_%i %n' | while read nlinks inum f; do + case $(objdump -h $f 2>/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)') in diff --git a/rpm-python.spec b/rpm-python.spec index f396cfd..ac09157 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -24,7 +24,7 @@ License: GPL v2 or later Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.4.2.3 -Release: 33 +Release: 34 Requires: rpm = %{version} %py_requires Source99: rpm.spec diff --git a/rpm.changes b/rpm.changes index 5c8516f..f26487a 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 16 17:10:31 CET 2009 - ro@suse.de + +- fix sort call in finddebuginfo again + ------------------------------------------------------------------- Wed Feb 11 14:01:51 CET 2009 - coolo@suse.de diff --git a/rpm.spec b/rpm.spec index 0204042..9855acb 100644 --- a/rpm.spec +++ b/rpm.spec @@ -27,7 +27,7 @@ PreReq: %insserv_prereq %fillup_prereq permissions AutoReqProv: on Summary: The RPM Package Manager Version: 4.4.2.3 -Release: 33 +Release: 34 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -332,7 +332,7 @@ Summary: A C library for parsing command line parameters License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 481 +Release: 482 # bug437293 %ifarch ppc64 Obsoletes: popt-64bit @@ -360,7 +360,7 @@ Summary: C Library for Parsing Command Line Parameters License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 481 +Release: 482 Requires: popt = 1.7 Requires: glibc-devel # bug437293 @@ -400,6 +400,8 @@ Authors: %doc %{_mandir}/man3/popt.3* %changelog +* Mon Feb 16 2009 ro@suse.de +- fix sort call in finddebuginfo again * Wed Feb 11 2009 coolo@suse.de - sort the result of find to make symlinks stable in finddebuginfo * Wed Feb 11 2009 coolo@suse.de