- update to rpm-4.4.6

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

diff --git a/rpm-debuginfo.patch b/rpm-debuginfo.patch
index bfb67956258f39eef3f7486cdc1dfe6dfd7e70e1..74f02d378ab0e60eb42036be18297fd4cdf54a68 100644 (file)
--- a/rpm-debuginfo.patch
+++ b/rpm-debuginfo.patch
@@ -25,59 +25,44 @@ diff -urN rpm-4.3.org/macros.in rpm-4.3/macros.in
  %defattr(-,root,root)\
  %endif\
  %{nil}
-@@ -844,7 +849,11 @@
+@@ -844,7 +849,7 @@
  %__spec_install_pre   %{___build_pre}
  %__spec_install_body  %{___build_body}
  %__spec_install_post\
-+%if %{?_enable_debug_packages:1}%{!?_enable_debug_packages:0}\
-+%if %{_enable_debug_packages}\
- %{?__debug_package:%{__debug_install_post}}\
-+%endif\
-+%endif\
+-%{?__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 +1259,12 @@
- unset DISPLAY ||:\
- %{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"
+ }
  
--%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\
-@@ -1407,7 +1421,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 | \
-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 @@
+ # Strip ELF binaries
+@@ -30,7 +31,7 @@
+       [ -f "${debugfn}" ] && continue
  
-       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
+ 
+       # 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}