From f9ae1da2de49f0c56d1fecec21efeb24bfd3c66a Mon Sep 17 00:00:00 2001 From: Krzysztof Daniel Date: Feb 16 2012 10:12:17 +0000 Subject: Bug 790694: Priorities of jsp, servlet and el packages updated. Conflicts: tomcat.spec --- diff --git a/tomcat.spec b/tomcat.spec index 78a979f..92fa169 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 @@ -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-3 +- Bug 790694: Priorities of jsp, servlet and el packages updated. + * Sun Jan 22 2012 Ivan Afonichev 0:7.0.25-2 - Added hack for maven depmap of tomcat-juli absolute link [ -f ] pass correctly