From a44688b6366190fe476dc92d1d06ea0b70a219b5 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Jun 30 2022 10:49:55 +0000
Subject: Pass _find_debuginfo_vendor_opts to the find-debuginfo script.

Resolves: #2099617

---

diff --git a/rpm-4.16.1.3-find_debuginfo_vendor_opts.patch b/rpm-4.16.1.3-find_debuginfo_vendor_opts.patch
new file mode 100644
index 0000000..c6f30a7
--- /dev/null
+++ b/rpm-4.16.1.3-find_debuginfo_vendor_opts.patch
@@ -0,0 +1,20 @@
+--- rpm.orig/macros.in	2022-06-30 11:37:18.975312592 +0100
++++ rpm-4.16.1.3/macros.in	2022-06-30 11:37:43.145158323 +0100
+@@ -167,6 +167,9 @@
+ #	A spec file can %%define _find_debuginfo_opts to pass options to
+ #	the script.  See the script for details.
+ #
++#	Vendor spec files (eg redhat-rpm-config:macros) can %%define
++#       _find_debuginfo_vendor_opts to pass options to the script.
++#
+ %__debug_install_post   \
+     %{_rpmconfigdir}/find-debuginfo.sh \\\
+     %{?_smp_build_ncpus:-j%{_smp_build_ncpus}} \\\
+@@ -179,6 +182,7 @@
+     %{?_unique_debug_srcs:--unique-debug-src-base "%{name}-%{VERSION}-%{RELEASE}.%{_arch}"} \\\
+     %{?_find_debuginfo_dwz_opts} \\\
+     %{?_find_debuginfo_opts} \\\
++    %{?_find_debuginfo_vendor_opts} \\\
+     %{?_debugsource_packages:-S debugsourcefiles.list} \\\
+     "%{_builddir}/%{?buildsubdir}"\
+ %{nil}
diff --git a/rpm.spec b/rpm.spec
index 14e9bf2..879ed7a 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -32,7 +32,7 @@
 
 %global rpmver 4.16.1.3
 #global snapver rc1
-%global rel 14
+%global rel 15
 %global sover 9
 
 %global srcver %{rpmver}%{?snapver:-%{snapver}}
@@ -100,6 +100,7 @@ Patch916: 0006-debugedit-Handle-DWARF-5-debug_line-and-debug_line_s.patch
 
 # Downstream-only patches
 Patch1000: rpm-4.16.1.3-hashtab-use-after-free-fix.patch
+Patch1001: rpm-4.16.1.3-find_debuginfo_vendor_opts.patch
 
 # Partially GPL/LGPL dual-licensed and some bits with BSD
 # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD
@@ -612,6 +613,9 @@ fi
 %doc doc/librpm/html/*
 
 %changelog
+* Thu Jun 30 2022 Nick Clifton  <nickc@redhat.com> - 4.16.1.3-15
+- Pass _find_debuginfo_vendor_opts to the find-debuginfo script.  (#2099617)
+
 * Tue Jun 28 2022 Florian Festi <ffesti@redhat.com> - 4.16.1.3-14
 - Warning for failed key import (#2069877)