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

diff --git a/rpm-debuginfo.patch b/rpm-debuginfo.patch
index 6def508..f1b160d 100644
--- a/rpm-debuginfo.patch
+++ b/rpm-debuginfo.patch
@@ -1,49 +1,17 @@
-diff -ur rpm.org/macros.in rpm/macros.in
---- rpm.org/macros.in	2007-10-02 20:31:56.905775000 +0200
-+++ rpm/macros.in	2007-10-02 20:35:30.122401828 +0200
-@@ -195,15 +195,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_PL.UTF-8\
-+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}
-@@ -1123,7 +1128,7 @@
- %{?buildroot:%{__rm} -rf '%{buildroot}'}
- %__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}
-diff -ur rpm.org/scripts/find-debuginfo.sh rpm/scripts/find-debuginfo.sh
---- rpm.org/scripts/find-debuginfo.sh	2007-09-06 09:36:38.000000000 +0200
-+++ rpm/scripts/find-debuginfo.sh	2007-10-02 20:38:57.745519759 +0200
-@@ -92,7 +92,8 @@
-   $strip_g && case "$(file -bi "$2")" in
-   application/x-sharedlib,*) g=-g ;;
+--- 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
--  eu-strip --remove-comment $g -f "$1" "$2" || exit
-+  objcopy --only-keep-debug --remove-section .comment "$2" "$1" || exit
-+  objcopy --add-gnu-debuglink="$1" "$2" || exit
+   [ -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