From 22beea5a05bec314bff53fc7a7700d37508d07d7ae5f7752112cf3bdcc3e4f7d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 21 Feb 2024 17:37:26 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/servletapi4?expand=0&rev=21 --- servletapi4.changes | 5 +++++ servletapi4.spec | 13 +++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/servletapi4.changes b/servletapi4.changes index ffb481a..b1207ec 100644 --- a/servletapi4.changes +++ b/servletapi4.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 21 17:37:21 UTC 2024 - Fridrich Strba + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Sat Mar 19 10:33:53 UTC 2022 - Fridrich Strba diff --git a/servletapi4.spec b/servletapi4.spec index 70004fb..8170900 100644 --- a/servletapi4.spec +++ b/servletapi4.spec @@ -1,7 +1,7 @@ # # spec file for package servletapi4 # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,10 +24,9 @@ Release: 0 Summary: Java servlet and JSP implementation classes License: Apache-1.1 Group: Development/Libraries/Java -URL: http://jakarta.apache.org/tomcat/ +URL: https://jakarta.apache.org/tomcat/ Source: %{full_name}-4-src.tar.gz Patch160: java160_build.patch -BuildRequires: ant BuildRequires: ant >= 1.2 BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-tools @@ -38,7 +37,6 @@ Obsoletes: servlet22 < %{version} Obsoletes: servlet4 < %{version} Provides: servlet22 = %{version} Provides: servlet4 = %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -56,7 +54,7 @@ contains the javadoc documentation for the Java Servlet and JSP APIs. %prep %setup -q -n %{full_name}-4-src -%patch160 -p1 +%patch -P 160 -p1 %build ant dist -Dservletapi.build=build -Dservletapi.dist=dist @@ -82,14 +80,13 @@ if [ "$1" = "0" ]; then fi %files -%defattr(-,root,root) -%doc LICENSE README.txt +%license LICENSE +%doc README.txt %{_javadir}/* %{_javadir}/servlet.jar %ghost %{_sysconfdir}/alternatives/servlet.jar %files javadoc -%defattr(-,root,root) %{_javadocdir}/%{name} %changelog