- arch macros

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

diff --git a/rpm-debuginfo.patch b/rpm-debuginfo.patch
index 74f02d378ab0e60eb42036be18297fd4cdf54a68..aec5afd5e7347fa14be051bfa382b02433375c99 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-31 17:16:23.251095072 +0200
-+++ rpm-4.3/macros.in  2004-05-31 17:35:47.653079064 +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,14 +195,19 @@
  %debug_package \
  %ifnarch noarch\
  %global __debug_package 1\
@@ -16,17 +16,15 @@ diff -urN rpm-4.3.org/macros.in rpm-4.3/macros.in
  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\
++%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\
+ %files debug -f debugfiles.list\
  %defattr(-,root,root)\
  %endif\
- %{nil}
-@@ -844,7 +849,7 @@
- %__spec_install_pre   %{___build_pre}
+@@ -1123,7 +1128,7 @@
+ %{?buildroot:%{__rm} -rf '%{buildroot}'}
  %__spec_install_body  %{___build_body}
  %__spec_install_post\
 -%{?__debug_package:%{__debug_install_post}}\
@@ -34,35 +32,16 @@ diff -urN rpm-4.3.org/macros.in rpm-4.3/macros.in
  %{__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 @@
- 
- strip_to_debug()
- {
--  eu-strip --remove-comment -f "$1" "$2" || :
-+  eu-strip --remove-comment -f "$1" -o "${2}.tmp" "$2" || :
-+  rm -f "${2}.tmp"
+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
  }
  
- # 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