Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at Wed Jul 29 17:17:18 CEST 2009. -------- --- rpm/rpm.changes 2009-07-24 11:48:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/rpm/rpm.changes 2009-07-27 18:18:10.000000000 +0200 @@ -1,0 +2,17 @@ +Mon Jul 27 18:02:37 CEST 2009 - rguenther@suse.de + +- add description to debuginfo packages + +------------------------------------------------------------------- +Mon Jul 27 15:46:36 CEST 2009 - rguenther@suse.de + +- do not strip .debug suffix during debug-link generation +- do not add requires based on private ELF flags [bnc#524681] +- remove requires on debuginfo from debugsource package + +------------------------------------------------------------------- +Sat Jul 25 12:04:11 CEST 2009 - rguenther@suse.de + +- fix debuginfo package generation for binaries without build-id + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- debuglink.diff elfflagreqprov.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm-python.spec ++++++ --- /var/tmp/diff_new_pack.bBApxR/_old 2009-07-29 17:15:23.000000000 +0200 +++ /var/tmp/diff_new_pack.bBApxR/_new 2009-07-29 17:15:23.000000000 +0200 @@ -24,7 +24,7 @@ Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.4.2.3 -Release: 44 +Release: 45 Requires: rpm = %{version} %py_requires Source99: rpm.spec ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.bBApxR/_old 2009-07-29 17:15:23.000000000 +0200 +++ /var/tmp/diff_new_pack.bBApxR/_new 2009-07-29 17:15:23.000000000 +0200 @@ -27,7 +27,7 @@ AutoReqProv: on Summary: The RPM Package Manager Version: 4.4.2.3 -Release: 44 +Release: 45 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -102,6 +102,8 @@ Patch69: buildidprov.diff Patch70: xz.diff Patch71: debugsubpkg.diff +Patch72: debuglink.diff +Patch73: elfflagreqprov.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # # avoid bootstrapping problem @@ -188,6 +190,8 @@ %patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69 %patch -P 70 %patch71 -p1 +%patch72 -p1 +%patch73 -p1 chmod 755 scripts/find-supplements{,.ksyms} chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms chmod 755 scripts/firmware.prov @@ -339,7 +343,7 @@ License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 492 +Release: 493 # bug437293 %ifarch ppc64 Obsoletes: popt-64bit @@ -367,7 +371,7 @@ License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 492 +Release: 493 Requires: popt = 1.7 Requires: glibc-devel # bug437293 ++++++ debuglink.diff ++++++ Index: rpm-4.4.2.3/scripts/find-debuginfo.sh =================================================================== --- rpm-4.4.2.3.orig/scripts/find-debuginfo.sh 2009-07-27 12:06:41.000000000 +0200 +++ rpm-4.4.2.3/scripts/find-debuginfo.sh 2009-07-27 12:08:05.000000000 +0200 @@ -185,7 +185,8 @@ make_id_link() get_debugfn() { dn=$(dirname "${1#$RPM_BUILD_ROOT}") - bn=$(basename "$1" .debug).debug +# Do not strip existing .debug suffixes + bn=$(basename "$1").debug debugdn=${debugdir}${dn} debugfn=${debugdn}/${bn} ++++++ debugsubpkg.diff ++++++ --- /var/tmp/diff_new_pack.bBApxR/_old 2009-07-29 17:15:24.000000000 +0200 +++ /var/tmp/diff_new_pack.bBApxR/_new 2009-07-29 17:15:24.000000000 +0200 @@ -1,7 +1,7 @@ Index: rpm-4.4.2.3/build/files.c =================================================================== ---- rpm-4.4.2.3.orig/build/files.c 2009-07-24 11:38:22.000000000 +0200 -+++ rpm-4.4.2.3/build/files.c 2009-07-24 11:38:30.000000000 +0200 +--- rpm-4.4.2.3.orig/build/files.c 2009-07-27 17:59:07.000000000 +0200 ++++ rpm-4.4.2.3/build/files.c 2009-07-27 18:02:00.000000000 +0200 @@ -28,6 +28,10 @@ #define _RPMTE_INTERNAL #include "rpmte.h" @@ -159,7 +159,7 @@ if (pkg->fileList == NULL) continue; -@@ -2508,6 +2638,106 @@ int processBinaryFiles(Spec spec, int in +@@ -2508,6 +2638,116 @@ int processBinaryFiles(Spec spec, int in if ((rc = processPackageFiles(spec, pkg, installSpecialDoc, test))) res = rc; @@ -179,6 +179,7 @@ + char tmp[1024]; + const char *name; + StringBuf files = NULL; ++ int seen_build_id = 0; + + /* Check if the current package has files with debug info + and record them. */ @@ -207,7 +208,6 @@ + files = newStringBuf(); + appendStringBuf(files, "%defattr(-,root,root)\n"); + appendStringBuf(files, "%dir /usr/lib/debug\n"); -+ appendStringBuf(files, "%dir /usr/lib/debug/.build-id\n"); + } + /* Add the files main debug-info file. */ + snprintf (tmp, 1024, "/usr/lib/debug/%s.debug\n", base); @@ -223,6 +223,11 @@ + if (getELFBuildId (name, &build_id, &build_id_size) == -1) + continue; + ++ /* If we see build-id links for the first time add the ++ directory. */ ++ if (!seen_build_id) ++ appendStringBuf(files, "%dir /usr/lib/debug/.build-id\n"); ++ + /* From the build-id construct the two links pointing back + to the debug information file and the binary. */ + snprintf (tmp, 1024, "/usr/lib/debug/.build-id/%02x/", @@ -249,6 +254,11 @@ + snprintf (tmp, 1024, "Debug information for package %s", name); + headerAddEntry (dbg->header, RPMTAG_SUMMARY, RPM_STRING_TYPE, + tmp, 1); ++ snprintf (tmp, 1024, "This package provides debug information for package %s.\n" ++ "Debug information is useful when developing applications that use this\n" ++ "package or when debugging this package.", name); ++ headerAddEntry (dbg->header, RPMTAG_DESCRIPTION, RPM_STRING_TYPE, ++ tmp, 1); + headerAddEntry (dbg->header, RPMTAG_GROUP, RPM_STRING_TYPE, + "Development/Debug", 1); + /* Inherit other tags from parent. */ @@ -268,9 +278,9 @@ } Index: rpm-4.4.2.3/macros.in =================================================================== ---- rpm-4.4.2.3.orig/macros.in 2009-07-24 11:38:22.000000000 +0200 -+++ rpm-4.4.2.3/macros.in 2009-07-24 11:38:22.000000000 +0200 -@@ -173,19 +173,6 @@ +--- rpm-4.4.2.3.orig/macros.in 2009-07-27 17:59:07.000000000 +0200 ++++ rpm-4.4.2.3/macros.in 2009-07-27 17:59:07.000000000 +0200 +@@ -173,24 +173,10 @@ # Template for debug information sub-package. %debug_package \ %global __debug_package 1\ @@ -290,10 +300,15 @@ %package debugsource\ Summary: Debug sources for package %{name}\ Group: Development/Debug\ + AutoReqProv: 0\ +-Requires: %{name}-debuginfo = %{version}-%{release}\ + %description debugsource\ + This package provides debug sources for package %{name}.\ + Debug sources are useful when developing applications that use this\ Index: rpm-4.4.2.3/scripts/find-debuginfo.sh =================================================================== ---- rpm-4.4.2.3.orig/scripts/find-debuginfo.sh 2009-07-24 11:38:22.000000000 +0200 -+++ rpm-4.4.2.3/scripts/find-debuginfo.sh 2009-07-24 11:38:22.000000000 +0200 +--- rpm-4.4.2.3.orig/scripts/find-debuginfo.sh 2009-07-27 17:59:06.000000000 +0200 ++++ rpm-4.4.2.3/scripts/find-debuginfo.sh 2009-07-27 17:59:10.000000000 +0200 @@ -274,19 +274,11 @@ while read nlinks inum f; do fi done || exit ++++++ elfflagreqprov.diff ++++++ Index: rpm-4.4.2.3/autodeps/linux.req =================================================================== --- rpm-4.4.2.3.orig/autodeps/linux.req 2009-07-24 11:38:21.000000000 +0200 +++ rpm-4.4.2.3/autodeps/linux.req 2009-07-27 15:45:17.000000000 +0200 @@ -110,6 +110,7 @@ for f in "${liblist[@]}" "${exelist[@]}" } } /^Version References:$/ { START=2; } + /^private flags/ { START=3; } (START==2) && /required from/ { sub(/:/, "", $3); LIBNAME=$3; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org