X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-debuginfo.patch;h=f1b160d6f0b454913056d6b9b78a78522fe27f3a;hb=b1541d4c520980f1e15d07220f64b77b96a5dd92;hp=9cdd6a5bbb62b505edaa8c61b80f15dd3178f6dd;hpb=3bf55f0f2533620265534ae92b1be905583f0e46;p=packages%2Frpm.git

diff --git a/rpm-debuginfo.patch b/rpm-debuginfo.patch
index 9cdd6a5..f1b160d 100644
--- a/rpm-debuginfo.patch
+++ b/rpm-debuginfo.patch
@@ -1,25 +1,17 @@
-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:34:57.953673240 +0200
-@@ -118,7 +118,7 @@
- %debug_package \
- %ifnarch noarch\
- %global __debug_package 1\
--%package debug\
-+%package debuginfo\
- Summary: Debug information for package %{name}\
- Group: Development/Debug\
- AutoReqProv: 0\
-@@ -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,12 @@ 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
++  local t=$(mktemp "/tmp/rpm.stripped.XXXXXX")
++  objcopy --compress-debug-sections "$2" || exit
++  eu-strip --remove-comment -f "$1" "$2" -o "$t" || exit
++  rm -f "$t"
++  chmod 444 "$1" || exit
+ }
+ 
+ # Make a relative symlink to $1 called $3$2