[packages/rpm/dev-5.4.16] dont-try-generate-rpmfc-dependencies-from-doc-files.patch applied upstream

[glen]

commit f2a23a9e8152272289f820d412a9b460258e8bba
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Mar 16 18:34:07 2016 +0200

    dont-try-generate-rpmfc-dependencies-from-doc-files.patch applied upstream

 rpm.spec | 3 ---
 1 file changed, 3 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 2d3a217..ef0e9f6 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -239,8 +239,6 @@ Patch1021:	%{name}-5.4.7-kmod-dependencies.patch
 Patch1022:	%{name}-5.4.5-skip-dependencies-for-character-devices.patch
 # status: probably okay to merge
 Patch1024:	%{name}-5.4.5-rpmfc-apply-python-coloring-from-magic.patch
-# status: probably okay to merge
-Patch1026:	%{name}-5.4.10-dont-try-generate-rpmfc-dependencies-from-doc-files.patch
 # status: ready
 Patch1027:	%{name}-5.4.7-fix-generation-of-ruby-abi-provides.patch
 # crash reproducable with 'rpm -qa --triggers'
@@ -987,7 +985,6 @@ cd -
 %patch1021 -p1
 %patch1022 -p1
 %patch1024 -p1
-#%patch1026 -p1 REDIFF
 #%patch1027 -p1 REDIFF
 %patch1028 -p1
 %patch1029 -p1
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/d13717b28b7530715133c3221a7d0ced2426bfcb