From 908fe913e569fbc7c85b2673528870d7d30e93a6 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Jul 26 2017 05:31:52 +0000
Subject: Backport trivial fix for debugsourcefiles.list ending up in random dir


Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>

---

diff --git a/0001-Make-sure-that-debugsourcefiles.list-is-generated-in.patch b/0001-Make-sure-that-debugsourcefiles.list-is-generated-in.patch
new file mode 100644
index 0000000..5361611
--- /dev/null
+++ b/0001-Make-sure-that-debugsourcefiles.list-is-generated-in.patch
@@ -0,0 +1,32 @@
+From 64c70fcdd9751cf1e8d25f1240fa7a0ea4e353fc Mon Sep 17 00:00:00 2001
+From: Mark Wielaard <mark@klomp.org>
+Date: Wed, 26 Jul 2017 02:37:17 +0200
+Subject: [PATCH] Make sure that debugsourcefiles.list is generated in the
+ build dir.
+
+The %_debugsource_template expects the debugsourcefiles.list file
+to be in the (current) build dir. Make sure that is always the case
+even if find-debuginfo.sh was invoked in a different (sub) directory
+by adding the build dir path as explicit argument to -S.
+
+Signed-off-by: Mark Wielaard <mark@klomp.org>
+---
+ macros.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/macros.in b/macros.in
+index f71fcc103..d882fa794 100644
+--- a/macros.in
++++ b/macros.in
+@@ -185,7 +185,7 @@
+     %{?_unique_debug_srcs:--unique-debug-src-base "%{name}-%{VERSION}-%{RELEASE}.%{_arch}"} \\\
+     %{?_find_debuginfo_dwz_opts} \\\
+     %{?_find_debuginfo_opts} \\\
+-    %{?_debugsource_packages:-S debugsourcefiles.list} \\\
++    %{?_debugsource_packages:-S "%{_builddir}/%{?buildsubdir}/debugsourcefiles.list"} \\\
+     "%{_builddir}/%{?buildsubdir}"\
+ %{nil}
+ 
+-- 
+2.13.3
+
diff --git a/rpm.spec b/rpm.spec
index 40ee752..7c5d09b 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -29,7 +29,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: %{?snapver:0.%{snapver}.}37%{?dist}
+Release: %{?snapver:0.%{snapver}.}38%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://ftp.rpm.org/releases/%{srcdir}/%{name}-%{srcver}.tar.bz2
@@ -158,6 +158,8 @@ Patch340: 0060-Return-error-exit-status-when-make-check-is-failed.patch
 # These are not yet upstream
 # Enable debugsource and debuginfo subpackages by default
 Patch900: 0001-macros-enable-debugsource-and-debuginfo-subpkgs-by-d.patch
+# Fixes for debugsource/debuginfo-ubspackages
+Patch901: 0001-Make-sure-that-debugsourcefiles.list-is-generated-in.patch
 Patch902: rpm-4.7.1-geode-i686.patch
 # Probably to be upstreamed in slightly different form
 Patch904: rpm-4.13.90-ldflags.patch
@@ -655,6 +657,9 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Wed Jul 26 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.13.0.1-38
+- Backport trivial fix for debugsourcefiles.list ending up in random dir
+
 * Tue Jul 25 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.13.0.1-37
 - Enable debugsource and debuginfo subpackages by default