Updated to 5.3.1

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

diff --git a/rpm-debuginfo.patch b/rpm-debuginfo.patch
index 3eefc98dd779d4bcd7f53a22215ddd32a2b3b4f6..2ea8c598020f00cb911baadfcea192dd85d1b49d 100644 (file)
--- a/rpm-debuginfo.patch
+++ b/rpm-debuginfo.patch
@@ -1,7 +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,21 @@
+--- 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\
@@ -26,24 +36,15 @@ diff -ur rpm.org/macros.in rpm/macros.in
  %defattr(-,root,root)\
  %endif\
  %{nil}
-@@ -1123,7 +1129,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}
---- 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 @@
+--- 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
  }
  
- # Make a relative symlink to $1 called $3$2