X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm-debuginfo.patch;h=f1b160d6f0b454913056d6b9b78a78522fe27f3a;hp=74f02d378ab0e60eb42036be18297fd4cdf54a68;hb=c546a4d6b5e74d51440163ab6c189f03db4bf29c;hpb=6fc678f54a54c8fe6902150f820955044ccfa139

diff --git a/rpm-debuginfo.patch b/rpm-debuginfo.patch
index 74f02d3..f1b160d 100644
--- a/rpm-debuginfo.patch
+++ b/rpm-debuginfo.patch
@@ -1,68 +1,17 @@
-diff -urN rpm-4.3.org/macros.in rpm-4.3/macros.in
---- rpm-4.3.org/macros.in	2004-05-31 17:16:23.251095072 +0200
-+++ rpm-4.3/macros.in	2004-05-31 17:35:47.653079064 +0200
-@@ -118,15 +118,20 @@
- %debug_package \
- %ifnarch noarch\
- %global __debug_package 1\
--%package debug\
-+%package debuginfo\
- Summary: Debug information for package %{name}\
-+Summary(pl): Informacje dla debuggera dla pakietu %{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\
-+%description debuginfo -l pl\
-+Ten pakiet dostarcza informacje dla debuggera dla pakietu %{name}.\
-+Informacje te s± przydatne przy rozwijaniu aplikacji u¿ywaj±cych tego\
-+pakietu oraz przy odpluskwianiu samego pakietu.\
-+%files debuginfo -f debugfiles.list\
- %defattr(-,root,root)\
- %endif\
- %{nil}
-@@ -844,7 +849,7 @@
- %__spec_install_pre	%{___build_pre}
- %__spec_install_body	%{___build_body}
- %__spec_install_post\
--%{?__debug_package:%{__debug_install_post}}\
-+%{expand:%%define __sip_%{?_enable_debug_packages} 1}%{?__sip_1:%{?__debug_package:%{__debug_install_post}}}%{expand:%%undefine __sip_%{?_enable_debug_packages}}\
- %{__arch_install_post}\
- %{__os_install_post}\
- %{nil}
---- rpm-4.4.3/scripts/find-debuginfo.sh.orig	2005-08-25 19:38:36.000000000 +0200
-+++ rpm-4.4.3/scripts/find-debuginfo.sh	2005-11-19 00:21:45.007754032 +0100
-@@ -15,7 +15,8 @@
+--- 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
  
- strip_to_debug()
- {
--  eu-strip --remove-comment -f "$1" "$2" || :
-+  eu-strip --remove-comment -f "$1" -o "${2}.tmp" "$2" || :
-+  rm -f "${2}.tmp"
+-  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
  }
  
- # Strip ELF binaries
-@@ -30,7 +31,7 @@
- 	[ -f "${debugfn}" ] && continue
- 
- 	echo extracting debug info from $f
--	/usr/lib/rpm/debugedit -b "$RPM_BUILD_DIR" -d /usr/src/debug -l "$SOURCEFILE" "$f"
-+	/usr/bin/debugedit -b "$RPM_BUILD_DIR" -d /usr/src/debug -l "$SOURCEFILE" "$f"
- 
- 	# A binary already copied into /usr/lib/debug doesn't get stripped,
- 	# just has its file names collected and adjusted.
---- rpm-4.3/platform.in.orig	2004-07-28 21:35:25.000000000 +0200
-+++ rpm-4.3/platform.in	2004-07-28 21:37:22.000000000 +0200
-@@ -60,7 +60,7 @@
- %{nil}
- 
- %__spec_install_post\
--    %{?__debug_package:%{__debug_install_post}}\
-+    %{expand:%%define __sip_%{?_enable_debug_packages} 1}%{?__sip_1:%{?__debug_package:%{__debug_install_post}}}%{expand:%%undefine __sip_%{?_enable_debug_packages}}\
-     %{__arch_install_post}\
-     %{__os_install_post}\
- %{nil}
+ # Make a relative symlink to $1 called $3$2