- R: bzip2 in build

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

diff --git a/rpm-debuginfo.patch b/rpm-debuginfo.patch
index b57fe563f8baf60d5394e0a091f4adbbb73f6e8e..bc9e015f5d94cebbf72498355480a8019f365e46 100644 (file)
--- a/rpm-debuginfo.patch
+++ b/rpm-debuginfo.patch
@@ -1,6 +1,6 @@
 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
+--- 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 @@
  %debug_package \
  %ifnarch noarch\
@@ -25,21 +25,28 @@ diff -urN rpm-4.3.org/macros.in rpm-4.3/macros.in
  %defattr(-,root,root)\
  %endif\
  %{nil}
-@@ -1247,7 +1252,12 @@
+@@ -844,7 +849,7 @@
+ %__spec_install_pre   %{___build_pre}
+ %__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}
+@@ -1250,7 +1250,10 @@
  unset DISPLAY ||:\
  %{nil}
  
 -%install %{?_enable_debug_packages:%{?buildsubdir:%{debug_package}}}\
 +%install \
-+%if %{?_enable_debug_packages:1}%{!?_enable_debug_packages:0}\
-+%if %{_enable_debug_packages}\
++%if 0%{?_enable_debug_packages}\
 +%{?buildsubdir:%{debug_package}}\
-+%endif\
 +%endif\
  %%install\
  LANG=C\
  export LANG\
-@@ -1404,7 +1414,7 @@
+@@ -1407,7 +1410,7 @@
      %{?verbose:set -x;} \
      if [ -d "$RPM_BUILD_ROOT" ]; then \
        echo "Strip executable binaries, archives and shared object files."; \
@@ -48,3 +55,35 @@ diff -urN rpm-4.3.org/macros.in rpm-4.3/macros.in
        elfexelist=`echo $filelist | xargs -r file | \
                awk '/ELF.*executable/ {print $1}' | cut -d: -f1`; \
        elfsharedlist=`echo $filelist | xargs -r file | \
+diff -urN rpm-4.3.org/scripts/find-debuginfo.sh rpm-4.3/scripts/find-debuginfo.sh
+--- rpm-4.3.org/scripts/find-debuginfo.sh      2004-05-31 17:16:16.146175184 +0200
++++ rpm-4.3/scripts/find-debuginfo.sh  2004-05-31 17:16:51.153853208 +0200
+@@ -26,12 +26,14 @@
+ 
+       mkdir -p "${debugdn}"
+       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"
+       if test -w "$f"; then
+-              eu-strip -f "${debugfn}" "$f" || :
++              eu-strip -f "${debugfn}" -o "$f.tmp" "$f" || :
++              rm -f "$f.tmp"
+       else
+               chmod u+w "$f"
+-              eu-strip -f "${debugfn}" "$f" || :
++              eu-strip -f "${debugfn}" -o "$f.tmp" "$f" || :
++              rm -f "$f.tmp"
+               chmod u-w "$f"
+       fi
+ done
+--- 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}