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

Related: #2160511 Add conflicts with the pki-servlet-engine package

Browse Source
This commit is contained in:
Hui Wang 2023-02-03 23:11:44 +08:00
parent 82f7c1c7cb
commit b8a32f4b4b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
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: 1%{?dist} Release: 2%{?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
@ -98,7 +98,6 @@ BuildRequires: systemd
Requires: java-headless >= 1:1.8.0 Requires: java-headless >= 1:1.8.0
Requires: javapackages-tools Requires: javapackages-tools
Requires: procps
Requires: %{name}-lib = %{epoch}:%{version}-%{release} Requires: %{name}-lib = %{epoch}:%{version}-%{release}
%if 0%{?fedora} || 0%{?rhel} > 7 %if 0%{?fedora} || 0%{?rhel} > 7
Recommends: tomcat-native >= %{native_version} Recommends: tomcat-native >= %{native_version}
@ -108,6 +107,10 @@ 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
Conflicts: pki-servlet-4.0-api <= 1:9.0.50
Conflicts: 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}
@ -500,6 +503,9 @@ fi
%changelog %changelog
* Fri Feb 03 2023 Hui Wang <huwang@redhat.com> - 1:9.0.62-2
- Add conflicts with the pki-servlet-engine package
* Mon Jan 16 2023 Hui Wang <huwang@redhat.com> - 1:9.0.62-1 * Mon Jan 16 2023 Hui Wang <huwang@redhat.com> - 1:9.0.62-1
- Update to 9.0.62. Related: rhbz#2160511 - Update to 9.0.62. Related: rhbz#2160511
- Remove examples webapps from subpackage - Remove examples webapps from subpackage