diff options
| author | Krzysztof Daniel <kdaniel@redhat.com> | 2012-02-16 10:03:34 +0100 |
|---|---|---|
| committer | Krzysztof Daniel <kdaniel@redhat.com> | 2012-02-16 10:03:34 +0100 |
| commit | d114e3c41bcbc20d4fd09f04e53846f2a5227143 (patch) | |
| tree | bb8008b7e2d1e4524c3509322e4ce8e3841b0b62 | |
| parent | 84c90670a967f124872b50b1ff230964d8b2751e (diff) | |
| parent | 38aa2517e845ce823fe9a76c93baf7f884d9e186 (diff) | |
| download | tomcat-d114e3c41bcbc20d4fd09f04e53846f2a5227143.tar.gz tomcat-d114e3c41bcbc20d4fd09f04e53846f2a5227143.tar.xz tomcat-d114e3c41bcbc20d4fd09f04e53846f2a5227143.zip | |
Bug 790694: Priorities of jsp, servlet and el packages updated.
Merge branch 'master' into f17
Conflicts:
tomcat.spec
| -rw-r--r-- | tomcat.spec | 11 |
1 files 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 <kdaniel@redhat.com> 0:7.0.25-4 +- Bug 790694: Priorities of jsp, servlet and el packages updated. + * Wed Feb 8 2012 Krzysztof Daniel <kdaniel@redhat.com> 0:7.0.25-3 - Dropped indirect dependecy to tomcat 5 |