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

Resolves: RHEL-78899 Missing Obsoletes

Browse Source
This commit is contained in:
Adam Krajcik 2025-02-11 17:45:53 +01:00
parent 985723a299
commit bd1bc8d61b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tomcat.spec
View File

@ -53,7 +53,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: Apache-2.0 License: Apache-2.0
@ -134,12 +134,12 @@ The docs web application for Apache Tomcat.
Summary: Apache Tomcat JavaServer Pages v%{jspspec} API Implementation Classes Summary: Apache Tomcat JavaServer Pages v%{jspspec} API Implementation Classes
Provides: jsp = %{jspspec} Provides: jsp = %{jspspec}
Obsoletes: %{name}-jsp-api < %{jspspec} Obsoletes: %{name}-jsp-api < %{jspspec}
Obsoletes: %{name}-jsp-2.3-api < %{version}
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: tomcat9 Conflicts: tomcat9
Conflicts: tomcat9-jsp-2.3-api Conflicts: tomcat9-jsp-2.3-api
%description jsp-%{jspspec}-api %description jsp-%{jspspec}-api
Apache Tomcat JSP API Implementation Classes. Apache Tomcat JSP API Implementation Classes.
@ -164,6 +164,7 @@ Libraries needed to run the Tomcat Web container.
Summary: Apache Tomcat Java Servlet v%{servletspec} API Implementation Classes Summary: Apache Tomcat Java Servlet v%{servletspec} API Implementation Classes
Provides: servlet = %{servletspec} Provides: servlet = %{servletspec}
Obsoletes: %{name}-servlet-api < %{servletspec} Obsoletes: %{name}-servlet-api < %{servletspec}
Obsoletes: %{name}-servlet-4.0-api < %{version}
Conflicts: tomcat9 Conflicts: tomcat9
Conflicts: tomcat9-servlet-4.0-api Conflicts: tomcat9-servlet-4.0-api
@ -174,6 +175,7 @@ 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-api < %{elspec} Obsoletes: %{name}-el-api < %{elspec}
Obsoletes: %{name}-el-3.0-api < %{version}
Conflicts: tomcat9 Conflicts: tomcat9
Conflicts: tomcat9-el-3.0-api Conflicts: tomcat9-el-3.0-api
@ -532,6 +534,9 @@ exit 0
%{appdir}/ROOT %{appdir}/ROOT
%changelog %changelog
* Tue Feb 11 2025 Adam Krajcik <akrajcik@redhat.com> - 1:10.1.8-2
- Resolves: RHEL-78899 Add missing Obsoletes
* Wed Feb 05 2025 Adam Krajcik <akrajcik@redhat.com> - 1:10.1.8-1 * Wed Feb 05 2025 Adam Krajcik <akrajcik@redhat.com> - 1:10.1.8-1
- Resolves: RHEL-51222 Upgrade tomcat to 10.1.8 - Resolves: RHEL-51222 Upgrade tomcat to 10.1.8