Hello community, here is the log from the commit of package rpm checked in at Sat Apr 19 23:47:56 CEST 2008. -------- --- rpm/rpm.changes 2008-04-10 12:50:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/rpm/rpm.changes 2008-04-16 18:22:54.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 16 17:57:43 CEST 2008 - jblunck@suse.de + +- Get rid of noise when no debuginfo was generated +- Never strip static libraries in find-debuginfo script + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm-python.spec ++++++ --- /var/tmp/diff_new_pack.a28009/_old 2008-04-19 23:47:34.000000000 +0200 +++ /var/tmp/diff_new_pack.a28009/_new 2008-04-19 23:47:34.000000000 +0200 @@ -17,7 +17,7 @@ Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.4.2 -Release: 229 +Release: 231 Requires: rpm = %{version} %py_requires Source99: rpm.spec ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.a28009/_old 2008-04-19 23:47:34.000000000 +0200 +++ /var/tmp/diff_new_pack.a28009/_new 2008-04-19 23:47:34.000000000 +0200 @@ -21,7 +21,7 @@ AutoReqProv: on Summary: The RPM Package Manager Version: 4.4.2 -Release: 187 +Release: 189 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -354,7 +354,7 @@ License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 415 +Release: 417 # %description -n popt @@ -377,7 +377,7 @@ License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 415 +Release: 417 Requires: popt = 1.7 Requires: glibc-devel @@ -412,6 +412,9 @@ %doc %{_mandir}/man3/popt.3* %changelog +* Wed Apr 16 2008 jblunck@suse.de +- Get rid of noise when no debuginfo was generated +- Never strip static libraries in find-debuginfo script * Thu Apr 10 2008 ro@suse.de - added baselibs.conf file for xxbit packages * Thu Apr 10 2008 jw@suse.de ++++++ debugsource-package.diff ++++++ --- /var/tmp/diff_new_pack.a28009/_old 2008-04-19 23:47:34.000000000 +0200 +++ /var/tmp/diff_new_pack.a28009/_new 2008-04-19 23:47:35.000000000 +0200 @@ -5,8 +5,8 @@ --- macros.in | 12 ++++++++++++ - scripts/find-debuginfo.sh | 39 ++++++++++++++++++++++++--------------- - 2 files changed, 36 insertions(+), 15 deletions(-) + scripts/find-debuginfo.sh | 43 ++++++++++++++++++++++++++----------------- + 2 files changed, 38 insertions(+), 17 deletions(-) Index: b/macros.in =================================================================== @@ -35,7 +35,7 @@ =================================================================== --- a/scripts/find-debuginfo.sh +++ b/scripts/find-debuginfo.sh -@@ -7,11 +7,13 @@ else BUILDDIR=$1 +@@ -7,14 +7,16 @@ else BUILDDIR=$1 fi LISTFILE=$BUILDDIR/debugfiles.list @@ -49,8 +49,13 @@ +[ -d "$TMPDIR" ] || TMPDIR="/tmp" +SOURCES_TMP=`mktemp $TMPDIR/rpmXXXXXX` - # Strip ELF binaries - for f in `find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) ` +-# Strip ELF binaries +-for f in `find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) ` ++# Strip ELF binaries (and never strip static libraries here) ++for f in `find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) ! -name "*.a" ` + do + case $(objdump -h $f 2>/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)') in + *debuglink*) continue ;; @@ -36,7 +38,8 @@ do echo extracting debug info from $f mode=$(stat -c %a $f) @@ -69,7 +74,7 @@ +find ${debugdir} -type d -print0 | xargs -0 -r chmod 0755 +find ${debugdir} -type f -print0 | xargs -0 -r chmod 0644 + -+find ${debugdir} -mindepth 1 -maxdepth 1 | \ ++find ${debugdir} -mindepth 1 -maxdepth 1 2>/dev/null | \ + sed -n -e "s#^$RPM_BUILD_ROOT##p" > $LISTFILE -mkdir -p ${RPM_BUILD_ROOT}/usr/src/debug @@ -103,5 +108,5 @@ - find $RPM_BUILD_ROOT/$p -type f -print0 | xargs -0 -r chmod 0644 - find $RPM_BUILD_ROOT/$p -type d -print0 | xargs -0 -r chmod 0755 -done -+find ${debugsrcdir} -mindepth 1 -maxdepth 1 | \ ++find ${debugsrcdir} -mindepth 1 -maxdepth 1 2>/dev/null | \ + sed -n -e "s#^$RPM_BUILD_ROOT##p" > $LISTSOURCE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org