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\
%defattr(-,root,root)\
%endif\
%{nil}
-@@ -1247,7 +1252,12 @@
- unset DISPLAY ||:\
+@@ -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}
+--- 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 @@
--%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\
-@@ -1404,7 +1414,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-20 22:09:25.767822256 +0200
-+++ rpm-4.3/scripts/find-debuginfo.sh 2004-05-20 23:12:43.367499352 +0200
-@@ -26,12 +26,14 @@
+ strip_to_debug()
+ {
+- eu-strip --remove-comment -f "$1" "$2" || :
++ eu-strip --remove-comment -f "$1" -o "${2}.tmp" "$2" || :
++ rm -f "${2}.tmp"
+ }
+
+ # 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}