X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm-debuginfo.patch;h=aecf32e7bee27a7964a15296d3369ab20a6fb904;hp=12eeb42584ed740d2bfabcd5da889a1ba4f999ea;hb=b2ff08d;hpb=dab7cdd02bf125ff2c9af3dd5addc188435dbfc3 diff --git a/rpm-debuginfo.patch b/rpm-debuginfo.patch index 12eeb42..aecf32e 100644 --- a/rpm-debuginfo.patch +++ b/rpm-debuginfo.patch @@ -1,35 +1,14 @@ -diff -urN rpm-4.3.org/macros.in rpm-4.3/macros.in ---- rpm-4.3.org/macros.in 2004-05-13 00:35:16.239893312 +0200 -+++ rpm-4.3/macros.in 2004-05-13 00:41:19.778627024 +0200 -@@ -118,15 +118,15 @@ - %debug_package \ - %ifnarch noarch\ - %global __debug_package 1\ --%package debug\ -+%package debuginfo\ - Summary: Debug information for package %{name}\ - Group: Development/Debug\ - AutoReqProv: 0\ --%description debug\ -+%description debuginfo\ - This package provides debug information for package %{name}.\ - Debug information is useful when developing applications that use this\ - package or when debugging this package.\ --%files debug -f debugfiles.list\ -+%files debuginfo -f debugfiles.list\ - %defattr(-,root,root)\ - %endif\ - %{nil} -@@ -844,7 +844,11 @@ - %__spec_install_pre %{___build_pre} - %__spec_install_body %{___build_body} - %__spec_install_post\ --%{?__debug_package:%{__debug_install_post}}\ -+%if %{?__debug_package:1}%{!?__debug_package:0}\ -+%if %{__debug_package}\ -+%{__debug_install_post}\ -+%endif\ -+%endif\ - %{__arch_install_post}\ - %{__os_install_post}\ - %{nil} +--- rpm-5.3.1/scripts/find-debuginfo.sh.wiget 2009-09-10 03:52:13.000000000 +0200 ++++ rpm-5.3.1/scripts/find-debuginfo.sh 2010-05-30 16:53:33.275994510 +0200 +@@ -254,7 +254,10 @@ strip_to_debug() + $strip_glibs && case "$(file -bi "$2")" in + application/x-sharedlib*) g=-g ;; + esac +- eu-strip --remove-comment $r $g ${keep_remove_args} -f "$1" "$2" || exit ++ local t=$(mktemp "/tmp/rpm.stripped.XXXXXX") ++ objcopy --compress-debug-sections "$2" || exit ++ eu-strip --remove-comment $r -f "$1" "$2" -o "$t" || exit ++ rm -f "$t" + chmod 444 "$1" || exit + } +