From 5b41d32bf856e4670f72d52782933779ec426db5 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 22 Jun 2018 09:51:25 -0400 Subject: [PATCH] Related: rhbz#1594139 Remove all ties to the tomcat package by cleaning up Provides and Obsoletes that overwrite any tomcat packages and result in pki-servlet-container being installed in cases we don't want it to tbe installed in --- pki-servlet-container.spec | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/pki-servlet-container.spec b/pki-servlet-container.spec index b1cba46..7a324c7 100644 --- a/pki-servlet-container.spec +++ b/pki-servlet-container.spec @@ -101,24 +101,7 @@ Requires(preun): chkconfig Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units - -# added after log4j sub-package was removed -Provides: tomcat-log4j = %{epoch}:%{version}-%{release} - -# Leftover requires/provides from removing the subpackages -# they still apply in instances where the old version is installed. - -#%%package jsp-%%{jspspec}-api -Provides: jsp = %{jspspec} -Obsoletes: tomcat-jsp-2.2-api - -#%%package lib Requires(preun): coreutils - -#%%package el-%%{elspec}-api -Provides: el_api = %{elspec} -Obsoletes: tomcat-el-2.2-api - Requires: pki-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} %description @@ -134,10 +117,6 @@ to be a collaboration of the best-of-breed developers from around the world. %package -n pki-servlet-%{servletspec}-api Group: Development/Libraries Summary: Apache Tomcat Java Servlet v%{servletspec} API Implementation Classes -Provides: servlet = %{servletspec} -Provides: servlet6 -Provides: servlet3 -Obsoletes: tomcat-servlet-3.1-api Requires(post): chkconfig Requires(postun): chkconfig