From 31f6752731c82ca9eec5c9d67b3cf96bbccaa045 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Jul 31 2017 12:46:51 +0000
Subject: Move _debuginfo_subpackages and _debugsource_packages to redhat-rpm-config


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

---

diff --git a/0001-macros-enable-debugsource-and-debuginfo-subpkgs-by-d.patch b/0001-macros-enable-debugsource-and-debuginfo-subpkgs-by-d.patch
deleted file mode 100644
index 8dcd128..0000000
--- a/0001-macros-enable-debugsource-and-debuginfo-subpkgs-by-d.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From e8b18b9cc2e92d7f9e4bdccdea40c224e742fb1f Mon Sep 17 00:00:00 2001
-From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
-Date: Tue, 25 Jul 2017 21:04:58 +0200
-Subject: [PATCH] macros: enable debugsource and debuginfo-subpkgs by default
-
-Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
----
- macros.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/macros.in b/macros.in
-index 851822891..f71fcc103 100644
---- a/macros.in
-+++ b/macros.in
-@@ -549,10 +549,10 @@ package or when debugging this package.\
- %_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?
--- 
-2.13.3
-
diff --git a/rpm.spec b/rpm.spec
index 1662950..9b15831 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}.}40%{?dist}
+Release: %{?snapver:0.%{snapver}.}41%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://ftp.rpm.org/releases/%{srcdir}/%{name}-%{srcver}.tar.bz2
@@ -168,8 +168,6 @@ Patch345: 0065-store-mapping-for-renamed-files.patch
 Patch346: 0066-reference-proper-debug-files-whenever-RemovePathPost.patch
 
 # These are not yet upstream
-# Enable debugsource and debuginfo subpackages by default
-Patch900: 0001-macros-enable-debugsource-and-debuginfo-subpkgs-by-d.patch
 Patch906: rpm-4.7.1-geode-i686.patch
 # Probably to be upstreamed in slightly different form
 Patch907: rpm-4.13.90-ldflags.patch
@@ -667,6 +665,9 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Mon Jul 31 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.13.0.1-41
+- Move _debuginfo_subpackages and _debugsource_packages to redhat-rpm-config
+
 * Sat Jul 29 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.13.0.1-40
 - Update latest patches from merged versions