From 1daf3ea73cfc6b18d5c20214ce675da2b9b979e1 Mon Sep 17 00:00:00 2001 From: Krzysztof Daniel Date: Wed, 8 Feb 2012 12:01:47 +0100 Subject: [PATCH 1/2] Dropped indirect dependency to tomcat5. --- tomcat.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 78a979f..7353c68 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -54,7 +54,7 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -98,7 +98,7 @@ BuildRequires: apache-commons-collections BuildRequires: apache-commons-daemon BuildRequires: apache-commons-dbcp BuildRequires: apache-commons-pool -BuildRequires: jakarta-taglibs-standard +BuildRequires: jakarta-taglibs-standard >= 0:1.1.2-4 BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils >= 0:1.7.0 BuildRequires: junit @@ -227,7 +227,7 @@ Expression Language 1.0. Group: Applications/Internet Summary: The ROOT and examples web applications for Apache Tomcat Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: jakarta-taglibs-standard >= 0:1.1 +Requires: jakarta-taglibs-standard >= 0:1.1.2-4 %description webapps The ROOT and examples web applications for Apache Tomcat. @@ -648,6 +648,9 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Wed Feb 8 2012 Krzysztof Daniel 0:7.0.25-3 +- Dropped indirect dependecy to tomcat 5 + * Sun Jan 22 2012 Ivan Afonichev 0:7.0.25-2 - Added hack for maven depmap of tomcat-juli absolute link [ -f ] pass correctly From 38aa2517e845ce823fe9a76c93baf7f884d9e186 Mon Sep 17 00:00:00 2001 From: Krzysztof Daniel Date: Thu, 16 Feb 2012 09:15:36 +0100 Subject: [PATCH 2/2] Bug 790694: Priorities of jsp, servlet and el packages updated. --- tomcat.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 7353c68..a314b92 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -54,7 +54,7 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 3%{?dist} +Release: 4%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -488,15 +488,15 @@ fi %post jsp-%{jspspec}-api %{_sbindir}/update-alternatives --install %{_javadir}/jsp.jar jsp \ - %{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20100 + %{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20200 %post servlet-%{servletspec}-api %{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet \ - %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20500 + %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 30000 %post el-%{elspec}-api %{_sbindir}/update-alternatives --install %{_javadir}/elspec.jar elspec \ - %{_javadir}/%{name}-el-%{elspec}-api.jar 20250 + %{_javadir}/%{name}-el-%{elspec}-api.jar 20300 %preun systemv %{_initrddir}/%{name} stop >/dev/null 2>&1 @@ -648,6 +648,9 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Thu Feb 16 2012 Krzysztof Daniel 0:7.0.25-4 +- Bug 790694: Priorities of jsp, servlet and el packages updated. + * Wed Feb 8 2012 Krzysztof Daniel 0:7.0.25-3 - Dropped indirect dependecy to tomcat 5