import CS tomcat-9.0.62-39.el9

This commit is contained in:
eabdullin 2024-03-28 11:56:20 +00:00
parent 9a94705a87
commit bdf8b25b0f
3 changed files with 22 additions and 41 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/tomcat-9.0.62.redhat-00013.tar.gz
SOURCES/tomcat-9.0.62.redhat-00018-src.zip

View File

@ -1 +1 @@
94609e966d0f3430f0b93633959bb070245d092f SOURCES/tomcat-9.0.62.redhat-00013.tar.gz
5becf21ed1eb5c031c31d5f295ce499234e98f82 SOURCES/tomcat-9.0.62.redhat-00018-src.zip

View File

@ -32,7 +32,7 @@
%global major_version 9
%global minor_version 0
%global micro_version 62
%global packdname %{name}-%{major_version}.%{minor_version}.%{micro_version}.redhat-00013
%global packdname %{name}-%{major_version}.%{minor_version}.%{micro_version}.redhat-00018-src
%global servletspec 4.0
%global elspec 3.0
%global tcuid 53
@ -56,12 +56,12 @@
Name: tomcat
Epoch: 1
Version: %{major_version}.%{minor_version}.%{micro_version}
Release: 16%{?dist}
Release: 39%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
License: ASL 2.0
URL: http://tomcat.apache.org/
Source0: %{packdname}.tar.gz
Source0: %{packdname}.zip
Source1: %{name}-%{major_version}.%{minor_version}.conf
Source3: %{name}-%{major_version}.%{minor_version}.sysconfig
Source4: %{name}-%{major_version}.%{minor_version}.wrapper
@ -121,33 +121,6 @@ Tomcat is developed in an open and participatory environment and
released under the Apache Software License version 2.0. Tomcat is intended
to be a collaboration of the best-of-breed developers from around the world.
%package java-jdk8
Group: Development/Java
Summary: Tomcat on JDK 8
Requires: java-1.8.0 >= 1:1.8
Provides: tomcat-java = %{epoch}:%{version}-%{release}
%description java-jdk8
Tomcat on JDK 8
%package java-jdk11
Group: Development/Java
Summary: Tomcat on JDK 11
Requires: (java-11 or java-11-headless)
Provides: tomcat-java = %{epoch}:%{version}-%{release}
%description java-jdk11
Tomcat on JDK 11
%package java-jdk17
Group: Development/Java
Summary: Tomcat on JDK 17
Requires: (java-17 or java-17-headless)
Provides: tomcat-java = %{epoch}:%{version}-%{release}
%description java-jdk17
Tomcat on JDK 17
%package admin-webapps
Summary: The host-manager and manager web applications for Apache Tomcat
Requires: %{name} = %{epoch}:%{version}-%{release}
@ -214,7 +187,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release}
The ROOT web application for Apache Tomcat.
%prep
%setup -q -n %{packdname}
%setup -q -n apache-%{packdname}
# 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" \) -delete
@ -584,21 +557,29 @@ fi
%defattr(0644,tomcat,tomcat,0755)
%{appdir}/ROOT
%files java-jdk8
%files java-jdk11
%files java-jdk17
%changelog
* Thu Jan 18 2024 Hui Wang <huwang@redhat.com> - 1:9.0.62-39
- Resolves: RHEL-17605
* Thu Nov 23 2023 Hui Wang <huwang@redhat.com> - 1:9.0.62-38
- Resolves: RHEL-13908
- Resolves: RHEL-13905
- Resolves: RHEL-12952
- Resolves: RHEL-12552
- Resolves: RHEL-2388
* Fri Oct 13 2023 Hui Wang <huwang@redhat.com> - 1:9.0.62-37
- Resolves: RHEL-12551
- Remove JDK subpackges which are unused
* Fri Aug 25 2023 Coty Sutherland <csutherl@redhat.com> - 1:9.0.62-16
- Related: #2184133 Declare file conflicts
* Fri Aug 25 2023 Coty Sutherland <csutherl@redhat.com> - 1:9.0.62-15
- Resolves: #2184133 Fix bug in Obsoletes
* Mon Aug 01 2023 Hui Wang <huwang@redhat.com> - 1:9.0.62-14
* Tue Aug 01 2023 Hui Wang <huwang@redhat.com> - 1:9.0.62-14
- Resolves: #2210632 CVE-2023-28709 tomcat
* Wed Jul 26 2023 Hui Wang <huwang@redhat.com> - 1:9.0.62-13
@ -611,7 +592,7 @@ fi
- Resolves: #2210632 CVE-2023-28709
- Resolves: #2184133 Add Obsoletes to tomcat package
- Update patch command
- Update source to use jws tomcat
- Update source to include the CVE fixes
* Thu Feb 23 2023 Hui Wang <huwang@redhat.com> - 1:9.0.62-11
- Bump release so that the NVR on RHEL-9 is higher than RHEL-8