- cleanup, I can't find _noPayloadPrefix macro used anywhere

[packages/rpm.git] / rpm-debuginfo.patch

diff --git a/rpm-debuginfo.patch b/rpm-debuginfo.patch
index 12eeb42584ed740d2bfabcd5da889a1ba4f999ea..949bdf27c44b51579108baa54e4da4e5b1f6ec20 100644 (file)
--- a/rpm-debuginfo.patch
+++ b/rpm-debuginfo.patch
@@ -1,35 +1,15 @@
-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
+@@ -92,8 +92,10 @@ strip_to_debug()
+   esac
+   [ -n "$EXCLUDE_FULL_REGEXP" ] && grep -E -q "$EXCLUDE_FULL_REGEXP" <<< "$2" && g=-g
+ 
+-  eu-strip --remove-comment $g $([ -n "$DISABLE_DEBUG" ] || echo -f "$1") "$2" || exit  
+-  [ -n "$DISABLE_DEBUG" ] || chmod 444 "$1" || exit
++  [ -n "$DISABLE_DEBUG" ] && return
++  objcopy --only-keep-debug --remove-section .comment "$2" "$1" || exit
++  objcopy --add-gnu-debuglink="$1" "$2" || exit
++  chmod 444 "$1" || exit
+ }
+ 
+ # Make a relative symlink to $1 called $3$2