- lockup fix

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

diff --git a/rpm-debuginfo.patch b/rpm-debuginfo.patch
index 43d6a8cc68d63ba0b057c120f347c679fbd2392a..74f02d378ab0e60eb42036be18297fd4cdf54a68 100644 (file)
--- a/rpm-debuginfo.patch
+++ b/rpm-debuginfo.patch
@@ -34,30 +34,19 @@ diff -urN rpm-4.3.org/macros.in rpm-4.3/macros.in
  %{__arch_install_post}\
  %{__os_install_post}\
  %{nil}
-@@ -1250,7 +1250,10 @@
- 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 0%{?_enable_debug_packages}\
-+%{?buildsubdir:%{debug_package}}\
-+%endif\
- %%install\
- LANG=C\
- export LANG\
-@@ -1407,7 +1410,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 | \
---- rpm-4.4.2/scripts/find-debuginfo.sh.orig   2005-07-14 17:52:31.000000000 +0200
-+++ rpm-4.4.2/scripts/find-debuginfo.sh        2005-07-23 13:57:04.542906944 +0200
-@@ -25,7 +25,7 @@
+ # Strip ELF binaries
+@@ -30,7 +31,7 @@
        [ -f "${debugfn}" ] && continue
  
        echo extracting debug info from $f
@@ -66,21 +55,6 @@ diff -urN rpm-4.3.org/macros.in rpm-4.3/macros.in
  
        # A binary already copied into /usr/lib/debug doesn't get stripped,
        # just has its file names collected and adjusted.
-@@ -35,10 +35,12 @@
- 
-       mkdir -p "${debugdn}"
-       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 @@