From cf3fb54530e015c828980da8fc873e16aa02daf78a95c82857ce77e621a4c668 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 16 Nov 2023 05:47:14 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat10?expand=0&rev=6 --- tomcat10.spec | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tomcat10.spec b/tomcat10.spec index 2f8745a..d1aa9ad 100644 --- a/tomcat10.spec +++ b/tomcat10.spec @@ -122,7 +122,7 @@ BuildRequires: unzip BuildRequires: wsdl4j BuildRequires: zip BuildRequires: pkgconfig(systemd) -Requires: tomcat10-lib = %{version}-%{release} +Requires: %{name}-lib = %{version}-%{release} Requires: apache-commons-daemon Requires: apache-commons-dbcp Requires: apache-commons-jexl @@ -148,7 +148,7 @@ ATTENTION: This tomcat is built with java %{java_version}. %package admin-webapps Summary: The host manager and manager web applications for Apache Tomcat Group: Productivity/Networking/Web/Servers -Requires: tomcat = %{version}-%{release} +Requires: %{name} = %{version}-%{release} Conflicts: tomcat-admin-webapps %description admin-webapps @@ -165,7 +165,7 @@ Embeddeding support (various libraries) for Apache Tomcat. %package docs-webapp Summary: The "docs" web application for Apache Tomcat Group: Productivity/Networking/Web/Servers -Requires: tomcat = %{version}-%{release} +Requires: %{name} = %{version}-%{release} Conflicts: tomcat-docs-webapp %description docs-webapp @@ -198,8 +198,6 @@ Javadoc generated documentation files for Apache Tomcat. %package jsp-%{jspspec_major}_%{jspspec_minor}-api Summary: Apache Tomcat JSP API implementation classes Group: Productivity/Networking/Web/Servers -Requires: mvn(org.apache.tomcat:tomcat-el-api) -Requires: mvn(org.apache.tomcat:tomcat-servlet-api) Requires(post): update-alternatives Requires(postun):update-alternatives Provides: tomcat-jsp-%{jspspec}-api @@ -215,7 +213,7 @@ Apache Tomcat JSP API implementation classes version %{jspspec} %package jsvc Summary: Apache jsvc wrapper for Apache Tomcat as separate service Group: Productivity/Networking/Web/Servers -Requires: tomcat = %{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: apache-commons-daemon-jsvc Conflicts: tomcat-jsvc @@ -260,7 +258,7 @@ Apache Tomcat Servlet API implementation classes version %{servletspec} %package webapps Summary: ROOT and examples web applications for Apache Tomcat Group: Productivity/Networking/Web/Servers -Requires: tomcat = %{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: jakarta-taglibs-standard >= 1.1 Conflicts: tomcat-webapps