Fridrich Strba 2024-02-21 17:37:26 +00:00 committed by Git OBS Bridge
parent ef2c592415
commit 22beea5a05
2 changed files with 10 additions and 8 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Feb 21 17:37:21 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Use %patch -P N instead of deprecated %patchN.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Mar 19 10:33:53 UTC 2022 - Fridrich Strba <fstrba@suse.com> Sat Mar 19 10:33:53 UTC 2022 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package servletapi4 # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -24,10 +24,9 @@ Release: 0
Summary: Java servlet and JSP implementation classes Summary: Java servlet and JSP implementation classes
License: Apache-1.1 License: Apache-1.1
Group: Development/Libraries/Java Group: Development/Libraries/Java
URL: http://jakarta.apache.org/tomcat/ URL: https://jakarta.apache.org/tomcat/
Source: %{full_name}-4-src.tar.gz Source: %{full_name}-4-src.tar.gz
Patch160: java160_build.patch Patch160: java160_build.patch
BuildRequires: ant
BuildRequires: ant >= 1.2 BuildRequires: ant >= 1.2
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
@ -38,7 +37,6 @@ Obsoletes: servlet22 < %{version}
Obsoletes: servlet4 < %{version} Obsoletes: servlet4 < %{version}
Provides: servlet22 = %{version} Provides: servlet22 = %{version}
Provides: servlet4 = %{version} Provides: servlet4 = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch BuildArch: noarch
%description %description
@ -56,7 +54,7 @@ contains the javadoc documentation for the Java Servlet and JSP APIs.
%prep %prep
%setup -q -n %{full_name}-4-src %setup -q -n %{full_name}-4-src
%patch160 -p1 %patch -P 160 -p1
%build %build
ant dist -Dservletapi.build=build -Dservletapi.dist=dist ant dist -Dservletapi.build=build -Dservletapi.dist=dist
@ -82,14 +80,13 @@ if [ "$1" = "0" ]; then
fi fi
%files %files
%defattr(-,root,root) %license LICENSE
%doc LICENSE README.txt %doc README.txt
%{_javadir}/* %{_javadir}/*
%{_javadir}/servlet.jar %{_javadir}/servlet.jar
%ghost %{_sysconfdir}/alternatives/servlet.jar %ghost %{_sysconfdir}/alternatives/servlet.jar
%files javadoc %files javadoc
%defattr(-,root,root)
%{_javadocdir}/%{name} %{_javadocdir}/%{name}
%changelog %changelog