$ git diff --patch-with-stat --summary 9da25e86681ccda4c1b31fe24533df2cc335dc8b..f9a05548c0e5c852d898ab3bbb72def1b9902521

 rpm-4.15.1-macros-run-debuginfo-after-other-scripts.patch | 14 ++++++++++++++
 rpm.spec                                                  | 11 ++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 rpm-4.15.1-macros-run-debuginfo-after-other-scripts.patch

diff --git a/rpm-4.15.1-macros-run-debuginfo-after-other-scripts.patch b/rpm-4.15.1-macros-run-debuginfo-after-other-scripts.patch
new file mode 100644
index 0000000..b303fd1
--- /dev/null
+++ b/rpm-4.15.1-macros-run-debuginfo-after-other-scripts.patch
@@ -0,0 +1,14 @@
+diff -up rpm-4.15.1/macros.in.omv~ rpm-4.15.1/macros.in
+--- rpm-4.15.1/macros.in.omv~	2020-03-21 18:43:07.903658575 +0100
++++ rpm-4.15.1/macros.in	2020-03-21 18:43:26.366587952 +0100
+@@ -888,9 +888,9 @@ package or when debugging this package.\
+ %__spec_install_pre	%{___build_pre}
+ %__spec_install_body	%{___build_body}
+ %__spec_install_post\
+-%{?__debug_package:%{__debug_install_post}}\
+ %{__arch_install_post}\
+ %{__os_install_post}\
++%{?__debug_package:%{__debug_install_post}}\
+ %{nil}
+ %__spec_install_template	#!%{__spec_install_shell}\
+ %{__spec_install_pre}\
diff --git a/rpm.spec b/rpm.spec
index 1a42c24..fe8eada 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -100,7 +100,7 @@ Version:	4.15.1
 %if "%{snapver}" != ""
 Release:	0.%{snapver}.1
 %else
-Release:	10
+Release:	11
 %endif
 Group:		System/Configuration/Packaging
 Url:		http://www.rpm.org/
@@ -235,6 +235,14 @@ Patch6004:	rpm-4.15.x-omv-patch-gendiff.patch
 Patch6005:	rpm-4.14-omv-i386-to-i686.patch
 Patch6007:	riscv64-optflags.patch
 Patch6008:	rpm-4.15.x-rosa-dont-require-contiguous-sighdr.patch
+# Run the debuginfo generator after, not before, other postprocessing scripts
+# have run.
+# This is important to make sure spec-helper's fix_file_permissions (which
+# makes sure library files are executable) is run before find-debuginfo
+# (which only looks at executable files) decides what files (not) to split.
+# This shrinks OpenJDK by 400 MB -- and certainly can't hurt other packages
+# that install libraries with odd permissions.
+Patch6009:	rpm-4.15.1-macros-run-debuginfo-after-other-scripts.patch
 
 
 # Partially GPL/LGPL dual-licensed and some bits with BSD
@@ -363,6 +371,7 @@ packages.
 %package build
 Summary:	Scripts and executable programs used to build packages
 Group:		System/Configuration/Packaging
+Provides:	perl-generators = %{version}-%{release}
 Requires:	autoconf
 Requires:	automake
 %ifarch %{riscv}