-@@ -1250,7 +1259,12 @@
- unset DISPLAY ||:\
- %{nil}
-
--%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 @@
+--- 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 @@
+ $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
+ }