rpms/tomcat
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolves: #2184135 Add Obsoletes to tomcat package

Browse Source
This commit is contained in:
Hui Wang 2023-08-18 14:53:26 +08:00
parent a5d10e3faf
commit f2eb7721df
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tomcat.spec
View File

@ -56,7 +56,7 @@
Name: tomcat Name: tomcat
Epoch: 1 Epoch: 1
Version: %{major_version}.%{minor_version}.%{micro_version} Version: %{major_version}.%{minor_version}.%{micro_version}
Release: 8%{?dist} Release: 9%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
License: ASL 2.0 License: ASL 2.0
@ -108,8 +108,8 @@ Requires(post): systemd
Requires(preun): systemd Requires(preun): systemd
Requires(postun): systemd Requires(postun): systemd
# We will change it to an obsoletes whenever the pki team is able to make the switch Provides: pki-servlet-engine
Conflicts: pki-servlet-engine <= 1:9.0.50 Obsoletes: pki-servlet-engine <= 1:9.0.50
# added after log4j sub-package was removed # added after log4j sub-package was removed
Provides: %{name}-log4j = %{epoch}:%{version}-%{release} Provides: %{name}-log4j = %{epoch}:%{version}-%{release}
@ -171,7 +171,8 @@ Provides: jsp = %{jspspec}
Obsoletes: %{name}-jsp-2.2-api Obsoletes: %{name}-jsp-2.2-api
Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
Conflicts: pki-servlet-engine <= 1:9.0.50 Provides: pki-servlet-engine
Obsoletes: pki-servlet-engine <= 1:9.0.50
%description jsp-%{jspspec}-api %description jsp-%{jspspec}-api
Apache Tomcat JSP API Implementation Classes. Apache Tomcat JSP API Implementation Classes.
@ -183,7 +184,8 @@ Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
Requires: ecj >= 1:4.10 Requires: ecj >= 1:4.10
Requires(preun): coreutils Requires(preun): coreutils
Conflicts: pki-servlet-engine <= 1:9.0.50 Provides: pki-servlet-engine
Obsoletes: pki-servlet-engine <= 1:9.0.50
%description lib %description lib
Libraries needed to run the Tomcat Web container. Libraries needed to run the Tomcat Web container.
@ -194,7 +196,8 @@ Provides: servlet = %{servletspec}
Provides: servlet6 Provides: servlet6
Provides: servlet3 Provides: servlet3
Obsoletes: %{name}-servlet-3.1-api Obsoletes: %{name}-servlet-3.1-api
Conflicts: pki-servlet-4.0-api <= 1:9.0.50 Provides: pki-servlet-4.0-api
Obsoletes: pki-servlet-4.0-api <= 1:9.0.50
%description servlet-%{servletspec}-api %description servlet-%{servletspec}-api
Apache Tomcat Servlet API Implementation Classes. Apache Tomcat Servlet API Implementation Classes.
@ -203,7 +206,8 @@ Apache Tomcat Servlet API Implementation Classes.
Summary: Apache Tomcat Expression Language v%{elspec} API Implementation Classes Summary: Apache Tomcat Expression Language v%{elspec} API Implementation Classes
Provides: el_api = %{elspec} Provides: el_api = %{elspec}
Obsoletes: %{name}-el-2.2-api Obsoletes: %{name}-el-2.2-api
Conflicts: pki-servlet-engine <= 1:9.0.50 and pki-servlet-container <= 1:9.0.7 Provides: pki-servlet-engine
Obsoletes: pki-servlet-engine <= 1:9.0.50
%description el-%{elspec}-api %description el-%{elspec}-api
Apache Tomcat EL API Implementation Classes. Apache Tomcat EL API Implementation Classes.
@ -595,6 +599,9 @@ fi
%changelog %changelog
* Thu Aug 17 2023 Hui Wang <huwang@redhat.com> - 1:9.0.62-9
- Resolves: #2184135 Add Obsoletes to tomcat package
* Thu Aug 17 2023 Hui Wang <huwang@redhat.com> - 1:9.0.62-8 * Thu Aug 17 2023 Hui Wang <huwang@redhat.com> - 1:9.0.62-8
- Resolves: #2189676 Missing Tomcat POM files in RHEL 8.9 - Resolves: #2189676 Missing Tomcat POM files in RHEL 8.9