--- rpm-5.3.1/scripts/find-debuginfo.sh.wiget	2009-09-10 03:52:13.000000000 +0200
+++ rpm-5.3.1/scripts/find-debuginfo.sh	2010-05-30 16:53:33.275994510 +0200
@@ -254,7 +254,10 @@ strip_to_debug()
   $strip_glibs && case "$(file -bi "$2")" in
     application/x-sharedlib*) g=-g ;;
   esac
-  eu-strip --remove-comment $r $g ${keep_remove_args} -f "$1" "$2" || exit
+  local t=$(mktemp "/tmp/rpm.stripped.XXXXXX")
+  objcopy --compress-debug-sections "$2" || exit
+  eu-strip --remove-comment $r -f "$1" "$2" -o "$t" || exit
+  rm -f "$t"
   chmod 444 "$1" || exit
 }
 
--- rpm-4.16.1.3/macros.in.orig	2021-03-24 09:50:21.000000000 +0100
+++ rpm-4.16.1.3/macros.in	2021-03-24 10:05:10.129698408 +0100
@@ -534,7 +534,7 @@
 #   Same as for "separate" but if the __debug_package global is set then
 #   the -debuginfo package will have a compatibility link for the main
 #   ELF /usr/lib/debug/.build-id/xx/yyy -> /usr/lib/.build-id/xx/yyy
-%_build_id_links compat
+%_build_id_links alldebug
 
 # Whether build-ids should be made unique between package version/releases
 # when generating debuginfo packages. If set to 1 this will pass
@@ -563,10 +563,10 @@
 %_unique_debug_srcs	1
 
 # Whether rpm should put debug source files into its own subpackage
-#%_debugsource_packages	1
+%_debugsource_packages	1
 
 # Whether rpm should create extra debuginfo packages for each subpackage
-#%_debuginfo_subpackages 1
+%_debuginfo_subpackages 1
 
 #
 # Use internal dependency generator rather than external helpers?