From 83481adde8f297f844ff5c03b8e582c34fe8abce7f733244148a2593fe4bdd8c Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 5 Sep 2008 17:37:54 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=50 --- finddebuginfo.diff | 19 ++++++++----------- rpm-python.changes | 5 +++++ rpm-python.spec | 6 ++++-- rpm.changes | 5 +++++ rpm.spec | 8 +++++--- 5 files changed, 27 insertions(+), 16 deletions(-) diff --git a/finddebuginfo.diff b/finddebuginfo.diff index e33a7b1..8d72657 100644 --- a/finddebuginfo.diff +++ b/finddebuginfo.diff @@ -1,12 +1,6 @@ ---- - scripts/find-debuginfo.sh | 78 ++++++++++++++++++++++++++++++++++++++-------- - 1 file changed, 65 insertions(+), 13 deletions(-) - -Index: scripts/find-debuginfo.sh -=================================================================== ---- scripts/find-debuginfo.sh.orig +--- scripts/find-debuginfo.sh +++ scripts/find-debuginfo.sh -@@ -14,9 +14,18 @@ debugdir="${RPM_BUILD_ROOT}/usr/lib/debu +@@ -14,9 +14,18 @@ echo -n > $SOURCEFILE # Strip ELF binaries @@ -27,7 +21,7 @@ Index: scripts/find-debuginfo.sh dn=$(dirname $f | sed -n -e "s#^$RPM_BUILD_ROOT##p") bn=$(basename $f .debug).debug -@@ -25,6 +34,8 @@ do +@@ -25,6 +34,8 @@ [ -f "${debugfn}" ] && continue echo extracting debug info from $f @@ -36,7 +30,7 @@ Index: scripts/find-debuginfo.sh /usr/lib/rpm/debugedit -b "$RPM_BUILD_DIR" -d /usr/src/debug -l "$SOURCEFILE" "$f" # A binary already copied into /usr/lib/debug doesn't get stripped, -@@ -34,19 +45,60 @@ do +@@ -34,19 +45,63 @@ esac mkdir -p "${debugdn}" @@ -47,6 +41,8 @@ Index: scripts/find-debuginfo.sh - eu-strip -f "${debugfn}" "$f" || : - chmod u-w "$f" + objcopy --only-keep-debug $f $debugfn || : ++ ( ++ shopt -s extglob + strip_option="--strip-all" + case "$f" in + *.ko) @@ -61,8 +57,9 @@ Index: scripts/find-debuginfo.sh + if test "$NO_DEBUGINFO_STRIP_DEBUG" = true ; then + strip_option= fi -+ objcopy --add-gnu-debuglink=$debugfn $strip_option $f || : ++ objcopy --add-gnu-debuglink=$debugfn -R .comment -R .GCC.command.line $strip_option $f + chmod $mode $f ++ ) || : done +#for f in `find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -name "*.exe.mdb" -or -name "*.dll.mdb" \) ` diff --git a/rpm-python.changes b/rpm-python.changes index 1109f99..f169277 100644 --- a/rpm-python.changes +++ b/rpm-python.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Aug 30 21:23:38 CEST 2008 - cthiel@suse.de + +- add libselinux-devel to BuildRequires + ------------------------------------------------------------------- Thu Aug 7 16:05:51 CEST 2008 - dmueller@suse.de diff --git a/rpm-python.spec b/rpm-python.spec index 53f35b9..2dbeecf 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -19,12 +19,12 @@ Name: rpm-python -BuildRequires: libbz2-devel lzma-alpha-devel ncurses-devel python-devel zlib-devel +BuildRequires: libbz2-devel libselinux-devel lzma-alpha-devel ncurses-devel python-devel zlib-devel License: GPL v2 or later Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.4.2 -Release: 277 +Release: 278 Requires: rpm = %{version} %py_requires Source99: rpm.spec @@ -69,6 +69,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/python* %changelog +* Sat Aug 30 2008 cthiel@suse.de +- add libselinux-devel to BuildRequires * Thu Aug 07 2008 dmueller@suse.de - fix build against python 2.6 * Thu Mar 27 2008 coolo@suse.de diff --git a/rpm.changes b/rpm.changes index c82914a..18056b0 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 5 16:56:23 CEST 2008 - dmueller@suse.de + +- strip .comment and .GCC.command.line sections from ELF binaries + ------------------------------------------------------------------- Mon Aug 25 14:48:28 CEST 2008 - prusnak@suse.cz diff --git a/rpm.spec b/rpm.spec index c098074..e794acf 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 -Release: 215 +Release: 217 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -361,7 +361,7 @@ Summary: A C library for parsing command line parameters License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 443 +Release: 445 # %description -n popt @@ -384,7 +384,7 @@ Summary: C Library for Parsing Command Line Parameters License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 443 +Release: 445 Requires: popt = 1.7 Requires: glibc-devel @@ -419,6 +419,8 @@ Authors: %doc %{_mandir}/man3/popt.3* %changelog +* Fri Sep 05 2008 dmueller@suse.de +- strip .comment and .GCC.command.line sections from ELF binaries * Mon Aug 25 2008 prusnak@suse.cz - enabled SELinux support [Fate#303662] * Thu Aug 21 2008 ro@suse.de