diff --git a/tomcat10.spec b/tomcat10.spec index ca94802..2f8745a 100644 --- a/tomcat10.spec +++ b/tomcat10.spec @@ -135,6 +135,7 @@ Requires(pre): shadow Requires: libtcnative-1-0 >= 1.2.38 Requires: logrotate BuildArch: noarch +Conflicts: tomcat %description Tomcat is the servlet container that is used in the official Reference @@ -148,6 +149,7 @@ ATTENTION: This tomcat is built with java %{java_version}. Summary: The host manager and manager web applications for Apache Tomcat Group: Productivity/Networking/Web/Servers Requires: tomcat = %{version}-%{release} +Conflicts: tomcat-admin-webapps %description admin-webapps The host manager and manager web-based applications for Apache Tomcat. @@ -155,6 +157,7 @@ The host manager and manager web-based applications for Apache Tomcat. %package embed Summary: Libraries for Embedding Apache Tomcat Group: Productivity/Networking/Web/Servers +Conflicts: tomcat-embed %description embed Embeddeding support (various libraries) for Apache Tomcat. @@ -163,6 +166,7 @@ Embeddeding support (various libraries) for Apache Tomcat. Summary: The "docs" web application for Apache Tomcat Group: Productivity/Networking/Web/Servers Requires: tomcat = %{version}-%{release} +Conflicts: tomcat-docs-webapp %description docs-webapp The documentation of web application for Apache Tomcat. @@ -177,7 +181,7 @@ Provides: el_%{elspec_major}_%{elspec_minor}_api = %{version}-%{release} Provides: el_api = %{elspec} Obsoletes: el_api < %{elspec} Obsoletes: tomcat-el-2_2-api < %{elspec} -Obsoletes: tomcat-el-3_0-api < %{elspec} +Conflicts: tomcat-el-3_0-api < %{elspec} %description el-%{elspec_major}_%{elspec_minor}-api Expression Language API version %{elspec}. @@ -186,6 +190,7 @@ Expression Language API version %{elspec}. Summary: Javadoc generated documentation for Apache Tomcat Group: Documentation/HTML BuildArch: noarch +Conflicts: tomcat-javadoc %description doc Javadoc generated documentation files for Apache Tomcat. @@ -202,7 +207,7 @@ Provides: jsp = %{jspspec} Provides: jsp%{jspspec_major}%{jspspec_minor} Obsoletes: jsp < %{jspspec} Obsoletes: tomcat-jsp-2_2-api < %{jspspec} -Obsoletes: tomcat-jsp-2_3-api < %{jspspec} +Conflicts: tomcat-jsp-2_3-api < %{jspspec} %description jsp-%{jspspec_major}_%{jspspec_minor}-api Apache Tomcat JSP API implementation classes version %{jspspec} @@ -212,6 +217,7 @@ Summary: Apache jsvc wrapper for Apache Tomcat as separate service Group: Productivity/Networking/Web/Servers Requires: tomcat = %{version}-%{release} Requires: apache-commons-daemon-jsvc +Conflicts: tomcat-jsvc %description jsvc Systemd service and wrapper scripts to start tomcat with jsvc, @@ -229,6 +235,7 @@ Requires(post): ecj >= 4.4 Requires(preun):coreutils Provides: jakarta-commons-dbcp-tomcat5 = 1.4 Obsoletes: jakarta-commons-dbcp-tomcat5 < 1.4 +Conflicts: tomcat-lib %description lib Libraries required to successfully run the Tomcat Web container @@ -245,7 +252,7 @@ Provides: servlet60 Obsoletes: servlet < %{servletspec} Obsoletes: tomcat-servlet-3_0-api < %{servletspec} Obsoletes: tomcat-servlet-3_1-api < %{servletspec} -Obsoletes: tomcat-servlet-4_0-api < %{servletspec} +Conflicts: tomcat-servlet-4_0-api < %{servletspec} %description servlet-%{servletspec_major}_%{servletspec_minor}-api Apache Tomcat Servlet API implementation classes version %{servletspec} @@ -255,6 +262,7 @@ Summary: ROOT and examples web applications for Apache Tomcat Group: Productivity/Networking/Web/Servers Requires: tomcat = %{version}-%{release} Requires: jakarta-taglibs-standard >= 1.1 +Conflicts: tomcat-webapps %description webapps The ROOT and examples web applications for Apache Tomcat