X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-debuginfo.patch;h=2ea8c598020f00cb911baadfcea192dd85d1b49d;hb=765b7c4193af0b9737c02aa103d1ebb2b3ebda9c;hp=b57fe563f8baf60d5394e0a091f4adbbb73f6e8e;hpb=1951e55cbbcddaf49eb161817dc9ced0d00d8cde;p=packages%2Frpm.git

diff --git a/rpm-debuginfo.patch b/rpm-debuginfo.patch
index b57fe56..2ea8c59 100644
--- a/rpm-debuginfo.patch
+++ b/rpm-debuginfo.patch
@@ -1,15 +1,26 @@
-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:40:19.156064416 +0200
-@@ -118,15 +118,20 @@
+--- rpm-5.3.1/macros/macros.rpmbuild.in.wiget	2010-03-31 14:22:06.000000000 +0200
++++ rpm-5.3.1/macros/macros.rpmbuild.in	2010-05-30 16:51:46.906008986 +0200
+@@ -383,7 +383,7 @@ echo "Patch #%{__patch_number} (%{basena
+ %{?buildroot:%{__rm} -rf '%{buildroot}'; %{__mkdir_p} '%{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}
+--- rpm-5.3.1/macros/macros.in.wiget	2010-05-30 16:47:23.389365448 +0200
++++ rpm-5.3.1/macros/macros.in	2010-05-30 16:47:23.412699985 +0200
+@@ -131,15 +131,21 @@
  %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}\
++Summary(pl.UTF-8): Informacje dla debuggera dla pakietu %{name}\
  Group: Development/Debug\
++Requires: filesystem-debuginfo >= 3.0-16\
  AutoReqProv: 0\
 -%description debug\
 +%description debuginfo\
@@ -17,34 +28,23 @@ 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.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 ||:\
- %{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,7 +92,8 @@ strip_to_debug()
+   $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
+   chmod 444 "$1" || 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\
-@@ -1404,7 +1414,7 @@
-     %{?verbose:set -x;} \
-     if [ -d "$RPM_BUILD_ROOT" ]; then \
- 	echo "Strip executable binaries, archives and shared object files."; \
--	filelist=`find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*" %{?_noautostrip:! -regex "%{_noautostrip}"}`; \
-+	filelist=`find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*" ! -regex ".*/usr/lib[0-9]*/debug/.*\.debug" %{?_noautostrip:! -regex "%{_noautostrip}"}`; \
- 	elfexelist=`echo $filelist | xargs -r file | \
- 		awk '/ELF.*executable/ {print $1}' | cut -d: -f1`; \
- 	elfsharedlist=`echo $filelist | xargs -r file | \