SHA256
1
0
forked from pool/tomcat

- Version update to 8.0.32:

* Another bugfix release for 8.0 series, full details:
    http://tomcat.apache.org/tomcat-8.0-doc/changelog.html#Tomcat_8.0.32_(markt)
- Rebase patch:
  * tomcat-8.0.9-property-build.windows.patch

OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=77
This commit is contained in:
Tomáš Chvátal
2016-02-17 18:24:24 +00:00
committed by Git OBS Bridge
parent 0fede34aeb
commit f4f0187f69
5 changed files with 61 additions and 26 deletions

View File

@@ -1,7 +1,7 @@
#
# spec file for package tomcat
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2009, JPackage Project
#
# All modifications and additions to the file contributed by third parties
@@ -23,6 +23,7 @@
%define elspec 3.0
%define major_version 8
%define minor_version 0
%define micro_version 32
%define micro_version 28
%define packdname apache-tomcat-%{version}-src
# FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/
@@ -155,8 +156,8 @@ The documentation of web application for Apache Tomcat.
%package el-3_0-api
Summary: Expression Language v3.0 API
Group: Development/Libraries/Java
Requires(post): %{_sbindir}/update-alternatives
Requires(preun): %{_sbindir}/update-alternatives
Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: %{name}-el-%{elspec}-api = %{version}-%{release}
Provides: el_3_0_api = %{version}-%{release}
Provides: el_api = %{elspec}
@@ -176,8 +177,8 @@ Javadoc generated documentation files for Apache Tomcat.
Summary: Apache Tomcat JSP API implementation classes
Group: Productivity/Networking/Web/Servers
Requires: %{name}-servlet-%{servletspec}-api = %{version}-%{release}
Requires(post): %{_sbindir}/update-alternatives
Requires(postun): %{_sbindir}/update-alternatives
Requires(post): update-alternatives
Requires(postun): update-alternatives
Provides: %{name}-jsp-%{jspspec}-api
Provides: jsp = %{jspspec}
Provides: jsp23
@@ -217,8 +218,8 @@ Libraries required to successfully run the Tomcat Web container
%package servlet-3_1-api
Summary: Apache Tomcat Servlet API implementation classes
Group: Productivity/Networking/Web/Servers
Requires(post): %{_sbindir}/update-alternatives
Requires(postun): %{_sbindir}/update-alternatives
Requires(post): update-alternatives
Requires(postun): update-alternatives
Provides: %{name}-servlet-%{servletspec}-api = %{version}-%{release}
Provides: servlet = %{servletspec}
Provides: servlet31
@@ -627,32 +628,32 @@ ln -sf %{_sysconfdir}/alternatives/servlet.jar %{buildroot}%{_javadir}/servlet.j
%endif
%post el-3_0-api
%{_sbindir}/update-alternatives --install %{_javadir}/el_api.jar el_api %{_javadir}/%{name}-el-%{elspec}-api.jar 20300
%{_sbindir}/update-alternatives --install %{_javadir}/el_1_0_api.jar el_1_0_api %{_javadir}/%{name}-el-%{elspec}-api.jar 20300
update-alternatives --install %{_javadir}/el_api.jar el_api %{_javadir}/%{name}-el-%{elspec}-api.jar 20300
update-alternatives --install %{_javadir}/el_1_0_api.jar el_1_0_api %{_javadir}/%{name}-el-%{elspec}-api.jar 20300
%preun el-3_0-api
if [ $1 -eq 0 ] ; then
%{_sbindir}/update-alternatives --remove el_api %{_javadir}/%{name}-el-%{elspec}-api.jar
%{_sbindir}/update-alternatives --remove el_1_0_api %{_javadir}/%{name}-el-%{elspec}-api.jar
update-alternatives --remove el_api %{_javadir}/%{name}-el-%{elspec}-api.jar
update-alternatives --remove el_1_0_api %{_javadir}/%{name}-el-%{elspec}-api.jar
fi
%post jsp-2_3-api
%{_sbindir}/update-alternatives --install %{_javadir}/jsp.jar jsp \
update-alternatives --install %{_javadir}/jsp.jar jsp \
%{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20200
%postun jsp-2_3-api
if [ $1 -eq 0 ] ; then
%{_sbindir}/update-alternatives --remove jsp \
update-alternatives --remove jsp \
%{_javadir}/%{name}-jsp-%{jspspec}-api.jar
fi
%post servlet-3_1-api
%{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet \
update-alternatives --install %{_javadir}/servlet.jar servlet \
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar 30000
%postun servlet-3_1-api
if [ $1 -eq 0 ] ; then
%{_sbindir}/update-alternatives --remove servlet \
update-alternatives --remove servlet \
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar
fi