From 18cd0dd6f36dcb08883ba3e3ebaaa9c8977f51cb1d75bbb773c82cc7a79e1be5 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Thu, 16 Nov 2023 14:38:32 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/tomcat10?expand=0&rev=13

---
 tomcat10.spec | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/tomcat10.spec b/tomcat10.spec
index 262683e..2e6d268 100644
--- a/tomcat10.spec
+++ b/tomcat10.spec
@@ -135,7 +135,7 @@ Requires(pre):  shadow
 Requires:       libtcnative-1-0 >= 1.2.38
 Requires:       logrotate
 BuildArch:      noarch
-Obsoletes:      %{app_name}
+Conflicts:      %{app_name}
 
 %description
 Tomcat is the servlet container that is used in the official Reference
@@ -149,7 +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:       %{name} = %{version}-%{release}
-Obsoletes:      %{app_name}-admin-webapps
+Conflicts:      %{app_name}-admin-webapps
 
 %description admin-webapps
 The host manager and manager web-based applications for Apache Tomcat.
@@ -157,7 +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
-Obsoletes:      %{app_name}-embed
+Conflicts:      %{app_name}-embed
 
 %description embed
 Embeddeding support (various libraries) for Apache Tomcat.
@@ -166,7 +166,7 @@ Embeddeding support (various libraries) for Apache Tomcat.
 Summary:        The "docs" web application for Apache Tomcat
 Group:          Productivity/Networking/Web/Servers
 Requires:       %{name} = %{version}-%{release}
-Obsoletes:      %{app_name}-docs-webapp
+Conflicts:      %{app_name}-docs-webapp
 
 %description docs-webapp
 The documentation of web application for Apache Tomcat.
@@ -181,7 +181,7 @@ Provides:       el_%{elspec_major}_%{elspec_minor}_api = %{version}-%{release}
 Provides:       el_api = %{elspec}
 Obsoletes:      el_api < %{elspec}
 Obsoletes:      %{app_name}-el-2_2-api < %{version}
-Obsoletes:      %{app_name}-el-3_0-api < %{version}
+Conflicts:      %{app_name}-el-3_0-api < %{version}
 
 %description el-%{elspec_major}_%{elspec_minor}-api
 Expression Language API version %{elspec}.
@@ -190,7 +190,7 @@ Expression Language API version %{elspec}.
 Summary:        Javadoc generated documentation for Apache Tomcat
 Group:          Documentation/HTML
 BuildArch:      noarch
-Obsoletes:      %{app_name}-javadoc
+Conflicts:      %{app_name}-javadoc
 
 %description doc
 Javadoc generated documentation files for Apache Tomcat.
@@ -205,7 +205,7 @@ Provides:       jsp = %{jspspec}
 Provides:       jsp%{jspspec_major}%{jspspec_minor}
 Obsoletes:      jsp < %{jspspec}
 Obsoletes:      %{app_name}-jsp-2_2-api < %{version}
-Obsoletes:      %{app_name}-jsp-2_3-api < %{version}
+Conflicts:      %{app_name}-jsp-2_3-api < %{version}
 
 %description jsp-%{jspspec_major}_%{jspspec_minor}-api
 Apache Tomcat JSP API implementation classes version %{jspspec}
@@ -215,7 +215,7 @@ Summary:        Apache jsvc wrapper for Apache Tomcat as separate service
 Group:          Productivity/Networking/Web/Servers
 Requires:       %{name} = %{version}-%{release}
 Requires:       apache-commons-daemon-jsvc
-Obsoletes:      %{app_name}-jsvc
+Conflicts:      %{app_name}-jsvc
 
 %description jsvc
 Systemd service and wrapper scripts to start tomcat with jsvc,
@@ -233,7 +233,7 @@ Requires(post): ecj >= 4.4
 Requires(preun):coreutils
 Provides:       jakarta-commons-dbcp-tomcat5 = 1.4
 Obsoletes:      jakarta-commons-dbcp-tomcat5 < 1.4
-Obsoletes:      %{app_name}-lib
+Conflicts:      %{app_name}-lib
 
 %description lib
 Libraries required to successfully run the Tomcat Web container
@@ -250,7 +250,7 @@ Provides:       servlet60
 Obsoletes:      servlet < %{servletspec}
 Obsoletes:      %{app_name}-servlet-3_0-api < %{version}
 Obsoletes:      %{app_name}-servlet-3_1-api < %{version}
-Obsoletes:      %{app_name}-servlet-4_0-api < %{version}
+Conflicts:      %{app_name}-servlet-4_0-api < %{version}
 
 %description servlet-%{servletspec_major}_%{servletspec_minor}-api
 Apache Tomcat Servlet API implementation classes version %{servletspec}
@@ -260,7 +260,7 @@ Summary:        ROOT and examples web applications for Apache Tomcat
 Group:          Productivity/Networking/Web/Servers
 Requires:       %{name} = %{version}-%{release}
 Requires:       jakarta-taglibs-standard >= 1.1
-Obsoletes:      %{app_name}-webapps
+Conflicts:      %{app_name}-webapps
 
 %description webapps
 The ROOT and examples web applications for Apache Tomcat