From 883262ffce4201540ca843f4547272439069bec70c896d94e2843397d96cd3e3 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 6 Mar 2024 07:25:50 +0000 Subject: [PATCH 1/2] Accepting request 1155427 from home:dancermak:branches:Java:packages Add missing Requires(post): util-linux to have runuser into post OBS-URL: https://build.opensuse.org/request/show/1155427 OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat10?expand=0&rev=39 --- tomcat10.changes | 5 +++++ tomcat10.spec | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/tomcat10.changes b/tomcat10.changes index 07df72b..b5fc36e 100644 --- a/tomcat10.changes +++ b/tomcat10.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 6 07:18:06 UTC 2024 - Dan Čermák + +- Add missing Requires(post): util-linux to have runuser into post + ------------------------------------------------------------------- Mon Mar 4 16:49:37 UTC 2024 - Fridrich Strba diff --git a/tomcat10.spec b/tomcat10.spec index 4643ad4..7649b14 100644 --- a/tomcat10.spec +++ b/tomcat10.spec @@ -132,6 +132,8 @@ Requires: apache-commons-pool2 Requires: jakarta-servlet Requires: java >= %{java_version} Requires(post): %fillup_prereq +# for runuser +Requires(post): util-linux Requires(post): libxslt-tools Requires(pre): shadow Requires: libtcnative-1-0 >= 1.2.38 @@ -155,6 +157,8 @@ Summary: The host manager and manager web applications for Apache Tomcat Group: Productivity/Networking/Web/Servers Requires: %{name} = %{version}-%{release} Requires(post): libxslt-tools +# for runuser +Requires(post): util-linux Conflicts: %{app_name}-admin-webapps %description admin-webapps @@ -173,6 +177,8 @@ Summary: The "docs" web application for Apache Tomcat Group: Productivity/Networking/Web/Servers Requires: %{name} = %{version}-%{release} Requires(post): libxslt-tools +# for runuser +Requires(post): util-linux Conflicts: %{app_name}-docs-webapp %description docs-webapp @@ -269,6 +275,8 @@ Group: Productivity/Networking/Web/Servers Requires: %{name} = %{version}-%{release} Requires: jakarta-taglibs-standard >= 1.1 Requires(post): libxslt-tools +# for runuser +Requires(post): util-linux Conflicts: %{app_name}-webapps %description webapps From 7667fa1e14f4a201857ffb914331bc00b5f4287a29cd191c92e192b622468b59 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 6 Mar 2024 07:28:27 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat10?expand=0&rev=40 --- tomcat10.spec | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tomcat10.spec b/tomcat10.spec index 7649b14..97e0194 100644 --- a/tomcat10.spec +++ b/tomcat10.spec @@ -131,18 +131,18 @@ Requires: apache-commons-logging Requires: apache-commons-pool2 Requires: jakarta-servlet Requires: java >= %{java_version} -Requires(post): %fillup_prereq -# for runuser -Requires(post): util-linux -Requires(post): libxslt-tools -Requires(pre): shadow Requires: libtcnative-1-0 >= 1.2.38 Requires: logrotate +Requires(post): %fillup_prereq +Requires(post): libxslt-tools +# for runuser +Requires(post): util-linux +Requires(pre): shadow %systemd_ordering -BuildArch: noarch Conflicts: %{app_name} Provides: group(tomcat) Provides: user(tomcat) +BuildArch: noarch %description Tomcat is the servlet container that is used in the official Reference @@ -189,12 +189,12 @@ Summary: Expression Language v%{elspec} API Group: Development/Libraries/Java Requires(post): update-alternatives Requires(preun): update-alternatives +Conflicts: %{app_name}-el-3_0-api < %{version} Provides: %{app_name}-el-%{elspec}-api = %{version}-%{release} Provides: el_%{elspec_major}_%{elspec_minor}_api = %{version}-%{release} Provides: el_api = %{elspec} Obsoletes: %{app_name}-el-2_2-api < %{version} Obsoletes: el_api < %{elspec} -Conflicts: %{app_name}-el-3_0-api < %{version} %description el-%{elspec_major}_%{elspec_minor}-api Expression Language API version %{elspec}. @@ -202,8 +202,8 @@ Expression Language API version %{elspec}. %package doc Summary: Javadoc generated documentation for Apache Tomcat Group: Documentation/HTML -BuildArch: noarch Conflicts: %{app_name}-javadoc +BuildArch: noarch %description doc Javadoc generated documentation files for Apache Tomcat. @@ -213,12 +213,12 @@ Summary: Apache Tomcat JSP API implementation classes Group: Productivity/Networking/Web/Servers Requires(post): update-alternatives Requires(postun): update-alternatives +Conflicts: %{app_name}-jsp-2_3-api < %{version} Provides: %{app_name}-jsp-%{jspspec}-api Provides: jsp = %{jspspec} Provides: jsp%{jspspec_major}%{jspspec_minor} Obsoletes: %{app_name}-jsp-2_2-api < %{version} Obsoletes: jsp < %{jspspec} -Conflicts: %{app_name}-jsp-2_3-api < %{version} %description jsp-%{jspspec_major}_%{jspspec_minor}-api Apache Tomcat JSP API implementation classes version %{jspspec} @@ -228,8 +228,8 @@ Summary: Apache jsvc wrapper for Apache Tomcat as separate service Group: Productivity/Networking/Web/Servers Requires: %{name} = %{version}-%{release} Requires: apache-commons-daemon-jsvc -%systemd_ordering Conflicts: %{app_name}-jsvc +%systemd_ordering %description jsvc Systemd service and wrapper scripts to start tomcat with jsvc, @@ -245,9 +245,9 @@ Requires: %{app_name}-servlet-%{servletspec}-api = %{version}-%{release} Requires: mvn(org.apache.tomcat:tomcat-websocket-client-api) Requires(post): ecj >= 4.4 Requires(preun): coreutils +Conflicts: %{app_name}-lib Provides: jakarta-commons-dbcp-tomcat5 = 1.4 Obsoletes: jakarta-commons-dbcp-tomcat5 < 1.4 -Conflicts: %{app_name}-lib %description lib Libraries required to successfully run the Tomcat Web container @@ -257,6 +257,7 @@ Summary: Apache Tomcat Servlet API implementation classes Group: Productivity/Networking/Web/Servers Requires(post): update-alternatives Requires(postun): update-alternatives +Conflicts: %{app_name}-servlet-4_0-api < %{version} Provides: %{app_name}-servlet-%{servletspec}-api = %{version}-%{release} Provides: servlet = %{servletspec} Provides: servlet11 @@ -264,7 +265,6 @@ Provides: servlet60 Obsoletes: %{app_name}-servlet-3_0-api < %{version} Obsoletes: %{app_name}-servlet-3_1-api < %{version} Obsoletes: servlet < %{servletspec} -Conflicts: %{app_name}-servlet-4_0-api < %{version} %description servlet-%{servletspec_major}_%{servletspec_minor}-api Apache Tomcat Servlet API implementation classes version %{servletspec}