From 6c8547a641f1fa1f63cf5aab02951cde3ccdf0d0a176a102d76cf2e531c30c12 Mon Sep 17 00:00:00 2001 From: Michele Bussolotto Date: Mon, 27 Nov 2023 08:18:24 +0000 Subject: [PATCH] Accepting request 1128665 from home:RMestre:branches:Java:packages - replace prep setup and patches macro with autosetup OBS-URL: https://build.opensuse.org/request/show/1128665 OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=281 --- tomcat-9.0-bootstrap-MANIFEST.MF.patch | 6 ++++-- tomcat-9.0-sle.catalina.policy.patch | 10 +++++----- tomcat-9.0-tomcat-users-webapp.patch | 8 ++++---- tomcat.changes | 5 +++++ tomcat.spec | 11 +---------- 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/tomcat-9.0-bootstrap-MANIFEST.MF.patch b/tomcat-9.0-bootstrap-MANIFEST.MF.patch index fa3c90f..73b7cba 100644 --- a/tomcat-9.0-bootstrap-MANIFEST.MF.patch +++ b/tomcat-9.0-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-9.0.82-src/res/META-INF/bootstrap.jar.manifest +=================================================================== +--- apache-tomcat-9.0.82-src.orig/res/META-INF/bootstrap.jar.manifest ++++ apache-tomcat-9.0.82-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-9.0-sle.catalina.policy.patch b/tomcat-9.0-sle.catalina.policy.patch index 9a50f78..da9102a 100644 --- a/tomcat-9.0-sle.catalina.policy.patch +++ b/tomcat-9.0-sle.catalina.policy.patch @@ -1,8 +1,8 @@ -Index: conf/catalina.policy +Index: apache-tomcat-9.0.82-src/conf/catalina.policy =================================================================== ---- conf/catalina.policy.orig -+++ conf/catalina.policy -@@ -167,6 +167,9 @@ grant { +--- apache-tomcat-9.0.82-src.orig/conf/catalina.policy ++++ apache-tomcat-9.0.82-src/conf/catalina.policy +@@ -171,6 +171,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 +@@ -220,6 +223,15 @@ grant codeBase "file:${catalina.home}/we }; diff --git a/tomcat-9.0-tomcat-users-webapp.patch b/tomcat-9.0-tomcat-users-webapp.patch index 8215910..f80eac7 100644 --- a/tomcat-9.0-tomcat-users-webapp.patch +++ b/tomcat-9.0-tomcat-users-webapp.patch @@ -1,8 +1,8 @@ -Index: conf/tomcat-users.xml +Index: apache-tomcat-9.0.82-src/conf/tomcat-users.xml =================================================================== ---- conf/tomcat-users.xml.orig -+++ conf/tomcat-users.xml -@@ -41,4 +41,14 @@ +--- apache-tomcat-9.0.82-src.orig/conf/tomcat-users.xml ++++ apache-tomcat-9.0.82-src/conf/tomcat-users.xml +@@ -53,4 +53,14 @@ --> diff --git a/tomcat.changes b/tomcat.changes index 6cc94dc..4d0931a 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 23 12:32:49 UTC 2023 - Ricardo Mestre + +- replace prep setup and patches macro with autosetup + ------------------------------------------------------------------- Fri Oct 13 11:12:07 UTC 2023 - Fridrich Strba diff --git a/tomcat.spec b/tomcat.spec index 562d04f..4de51e7 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -241,20 +241,11 @@ Requires: jakarta-taglibs-standard >= 1.1 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