- arch macros

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

diff --git a/rpm-debuginfo.patch b/rpm-debuginfo.patch
index 9cdd6a5bbb62b505edaa8c61b80f15dd3178f6dd..aec5afd5e7347fa14be051bfa382b02433375c99 100644 (file)
--- a/rpm-debuginfo.patch
+++ b/rpm-debuginfo.patch
@@ -1,25 +1,47 @@
-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 @@
+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,14 +195,19 @@
  %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\
-@@ -844,7 +844,11 @@
- %__spec_install_pre   %{___build_pre}
+-%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.\
++%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 debug -f debugfiles.list\
+ %defattr(-,root,root)\
+ %endif\
+@@ -1123,7 +1128,7 @@
+ %{?buildroot:%{__rm} -rf '%{buildroot}'}
  %__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\
++%{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 ;;
+   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
+ }
+ 
+ # Make a relative symlink to $1 called $3$2