From c89623affca4de51aba9f79fe43a58bf9e4399bd7ad7e91abbbdfb16175fc105 Mon Sep 17 00:00:00 2001 From: Michele Bussolotto Date: Mon, 27 Nov 2023 15:11:56 +0000 Subject: [PATCH] Accepting request 1129164 from home:RMestre:branches:Java:packages - replace prep setup and patches macro with autosetup OBS-URL: https://build.opensuse.org/request/show/1129164 OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat10?expand=0&rev=16 --- tomcat-bootstrap-MANIFEST.MF.patch | 6 ++++-- tomcat-sle.catalina.policy.patch | 10 +++++----- tomcat-tomcat-users-webapp.patch | 8 ++++---- tomcat10.changes | 5 +++++ tomcat10.spec | 20 ++++++-------------- 5 files changed, 24 insertions(+), 25 deletions(-) diff --git a/tomcat-bootstrap-MANIFEST.MF.patch b/tomcat-bootstrap-MANIFEST.MF.patch index fa3c90f..1d6d2cf 100644 --- a/tomcat-bootstrap-MANIFEST.MF.patch +++ b/tomcat-bootstrap-MANIFEST.MF.patch @@ -1,5 +1,7 @@ ---- res/META-INF/bootstrap.jar.manifest.orig 2010-04-06 10:11:09.000000000 -0600 -+++ res/META-INF/bootstrap.jar.manifest 2010-04-06 10:45:56.000000000 -0600 +Index: apache-tomcat-10.1.14-src/res/META-INF/bootstrap.jar.manifest +=================================================================== +--- apache-tomcat-10.1.14-src.orig/res/META-INF/bootstrap.jar.manifest ++++ apache-tomcat-10.1.14-src/res/META-INF/bootstrap.jar.manifest @@ -1,6 +1,5 @@ Manifest-Version: 1.0 Main-Class: org.apache.catalina.startup.Bootstrap diff --git a/tomcat-sle.catalina.policy.patch b/tomcat-sle.catalina.policy.patch index 9a50f78..b1e2810 100644 --- a/tomcat-sle.catalina.policy.patch +++ b/tomcat-sle.catalina.policy.patch @@ -1,8 +1,8 @@ -Index: conf/catalina.policy +Index: apache-tomcat-10.1.14-src/conf/catalina.policy =================================================================== ---- conf/catalina.policy.orig -+++ conf/catalina.policy -@@ -167,6 +167,9 @@ grant { +--- apache-tomcat-10.1.14-src.orig/conf/catalina.policy ++++ apache-tomcat-10.1.14-src/conf/catalina.policy +@@ -170,6 +170,9 @@ grant { permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat"; // Precompiled JSPs need access to these packages. @@ -12,7 +12,7 @@ Index: conf/catalina.policy permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.el"; permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime"; permission java.lang.RuntimePermission -@@ -216,6 +219,15 @@ grant codeBase "file:${catalina.home}/we +@@ -219,6 +222,15 @@ grant codeBase "file:${catalina.home}/we }; diff --git a/tomcat-tomcat-users-webapp.patch b/tomcat-tomcat-users-webapp.patch index 8215910..c745d8a 100644 --- a/tomcat-tomcat-users-webapp.patch +++ b/tomcat-tomcat-users-webapp.patch @@ -1,8 +1,8 @@ -Index: conf/tomcat-users.xml +Index: apache-tomcat-10.1.14-src/conf/tomcat-users.xml =================================================================== ---- conf/tomcat-users.xml.orig -+++ conf/tomcat-users.xml -@@ -41,4 +41,14 @@ +--- apache-tomcat-10.1.14-src.orig/conf/tomcat-users.xml ++++ apache-tomcat-10.1.14-src/conf/tomcat-users.xml +@@ -53,4 +53,14 @@ --> diff --git a/tomcat10.changes b/tomcat10.changes index 279a6bb..3d7afdc 100644 --- a/tomcat10.changes +++ b/tomcat10.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 27 13:14:21 UTC 2023 - Ricardo Mestre + +- replace prep setup and patches macro with autosetup + ------------------------------------------------------------------- Tue Nov 14 15:03:27 UTC 2023 - Michele Bussolotto diff --git a/tomcat10.spec b/tomcat10.spec index ae1cc2b..ce770f8 100644 --- a/tomcat10.spec +++ b/tomcat10.spec @@ -1,5 +1,5 @@ # -# spec file for package tomcat +# spec file # # Copyright (c) 2023 SUSE LLC # Copyright (c) 2000-2009, JPackage Project @@ -16,6 +16,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %define app_name tomcat %define jspspec_major 3 %define jspspec_minor 1 @@ -179,8 +180,8 @@ Requires(preun):update-alternatives Provides: %{app_name}-el-%{elspec}-api = %{version}-%{release} 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: el_api < %{elspec} Conflicts: %{app_name}-el-3_0-api < %{version} %description el-%{elspec_major}_%{elspec_minor}-api @@ -203,8 +204,8 @@ Requires(postun):update-alternatives Provides: %{app_name}-jsp-%{jspspec}-api Provides: jsp = %{jspspec} Provides: jsp%{jspspec_major}%{jspspec_minor} -Obsoletes: jsp < %{jspspec} 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 @@ -247,9 +248,9 @@ Provides: %{app_name}-servlet-%{servletspec}-api = %{version}-%{release} Provides: servlet = %{servletspec} Provides: servlet11 Provides: servlet60 -Obsoletes: servlet < %{servletspec} 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 @@ -266,20 +267,11 @@ Conflicts: %{app_name}-webapps The ROOT and examples web applications for Apache Tomcat %prep -%setup -q -n %{packdname} -b33 +%autosetup -p1 -n %{packdname} -b 33 # remove pre-built binaries and windows files find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \ -name "*.jar" -o -name "*.war" -o -name "*.zip" \) -print -delete -%patch0 -%patch1 -%patch2 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 # remove date from docs sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl