- still needed

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

diff --git a/rpm-debuginfo.patch b/rpm-debuginfo.patch
index ad50ea1313f67400d409b3f2c7e7a24235aae52d..6def508c54bfc27754c35cbe6ba06df34f28bd35 100644 (file)
--- a/rpm-debuginfo.patch
+++ b/rpm-debuginfo.patch
@@ -1,7 +1,7 @@
-diff -urN rpm-4.3.org/macros.in rpm-4.3/macros.in
---- rpm-4.3.org/macros.in      2004-05-20 22:09:48.582353920 +0200
-+++ rpm-4.3/macros.in  2004-05-20 22:12:42.086977208 +0200
-@@ -118,15 +118,20 @@
+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\
@@ -17,25 +17,33 @@ diff -urN rpm-4.3.org/macros.in rpm-4.3/macros.in
  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\
++%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\
++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}
-@@ -1247,7 +1252,12 @@
- unset DISPLAY ||:\
+@@ -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 ;;
+   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
+ }
  
--%install %{?_enable_debug_packages:%{?buildsubdir:%{debug_package}}}\
-+%install \
-+%if %{?_enable_debug_packages:1}%{!?_enable_debug_packages:0}\
-+%if %{_enable_debug_packages}\
-+%{?buildsubdir:%{debug_package}}\
-+%endif\
-+%endif\
- %%install\
- LANG=C\
- export LANG\
+ # Make a relative symlink to $1 called $3$2