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

diff --git a/rpm.spec b/rpm.spec
index 2d3a217fa35f2b2c3fb46536cdad344cfb8cb5fc..ef0e9f68bce3236a22650b52b5ccebf5bdc1fc75 100644 (file)
--- 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