From 39f054938ea0f499735107b4da492dfb4723e1d7 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Tue, 7 Feb 2023 13:58:37 -0500 Subject: [PATCH] Related: rhbz#2160511 Add conflicts declaration to the appropriate subpackages Also, temporarily fix a malformed DTD so that rpminspect will pass --- fix-malformed-dtd.patch | 8 ++++++++ tomcat.spec | 15 ++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 fix-malformed-dtd.patch diff --git a/fix-malformed-dtd.patch b/fix-malformed-dtd.patch new file mode 100644 index 0000000..f5f7546 --- /dev/null +++ b/fix-malformed-dtd.patch @@ -0,0 +1,8 @@ +diff -up ./java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd.orig ./java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd +--- ./java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd.orig 2023-02-07 14:11:25.294179017 -0500 ++++ ./java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd 2023-02-07 14:11:28.629196705 -0500 +@@ -1,4 +1,3 @@ +- +