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:
parent
0fede34aeb
commit
f4f0187f69
3
apache-tomcat-8.0.32-src.tar.gz
Normal file
3
apache-tomcat-8.0.32-src.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560
|
||||
size 4957920
|
17
apache-tomcat-8.0.32-src.tar.gz.asc
Normal file
17
apache-tomcat-8.0.32-src.tar.gz.asc
Normal file
@ -0,0 +1,17 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2
|
||||
|
||||
iQIcBAABCAAGBQJWsQbNAAoJEBDAHFovYFnnZRoP/1kS4JhRn1QLHI00h1VKRITF
|
||||
18xGGlXKBYJTYlynhEULxlFk5xV4ExSsaZFz3wHoMpKH5UwwBuwv9FF6sbdwuRhN
|
||||
xBkVhM5LhV0/eL1Qk7OqyrbWms3FmzC0mq9MTweHM1HCCeZ8/n6Aiz+ykGD/U22i
|
||||
7fX3tQVZLC9QFVmpLFWjT4BkAV+5eUqJWSbKCP8jiQ5t76zRzG31tjpF8sPsXZ53
|
||||
FfIDpC5Sho1Mk2/Ak10QMtN0ArQ2Y64mpZvi4Lqh5+b24tA2HT8VdAuhke3hmgll
|
||||
wozMy8ci7atuAg2vcYq6VXj0dnUgf1GTUU28YoQbkVHegCPXy/VMnL6O38ednF/X
|
||||
ZiL0Gbk5sCVPnPMb6UN3IEKP+ukG3tucpDQY/MMXkb5I3WyBQvc/Kwx0nG8aOmUY
|
||||
DzeGtSKQhW+08GsHMeoc9eYHukedWWxL8O2x6ozgSKNhyjq84rJI0ndgk0niemVu
|
||||
mLofmzbIrnnUY+R6dDoR2TqUyZVmkw1uFE7Pb165kSuJJauP5kRGrKOCNfbsjl1H
|
||||
OHK7+2PZ1SrrEAWEAAg5LmEtbkq9HJeInKEjDXaW9ASS5VqZpOIPo4JgjBv3NR2J
|
||||
xdDmCa0Zy7nVPtwOsi8s02fJCP0BBFh8hb4hcdkG+aR9UYsCdfx2L+mxwusdS8dI
|
||||
5Mkeg1+WUp9XnYkCu+8G
|
||||
=M/JH
|
||||
-----END PGP SIGNATURE-----
|
@ -1,17 +1,22 @@
|
||||
diff -Naur apache-tomcat-8.0.9-src.orig/build.properties.default apache-tomcat-8.0.9-src/build.properties.default
|
||||
--- apache-tomcat-8.0.9-src.orig/build.properties.default 2014-07-10 00:40:22.307077465 +0200
|
||||
+++ apache-tomcat-8.0.9-src/build.properties.default 2014-07-10 00:46:11.686385324 +0200
|
||||
@@ -230,3 +230,6 @@
|
||||
|
||||
# ----- JVM settings for unit tests
|
||||
Index: apache-tomcat-8.0.32-src/build.properties.default
|
||||
===================================================================
|
||||
--- apache-tomcat-8.0.32-src.orig/build.properties.default
|
||||
+++ apache-tomcat-8.0.32-src/build.properties.default
|
||||
@@ -58,6 +58,9 @@ execute.findbugs=false
|
||||
# multicast tests to work
|
||||
java.net.preferIPv4Stack=false
|
||||
+
|
||||
|
||||
+# ----- Build on Windows ----
|
||||
+build.windows=false
|
||||
diff -Naur apache-tomcat-8.0.9-src.orig/build.xml apache-tomcat-8.0.9-src/build.xml
|
||||
--- apache-tomcat-8.0.9-src.orig/build.xml 2014-07-10 00:40:22.231077516 +0200
|
||||
+++ apache-tomcat-8.0.9-src/build.xml 2014-07-10 00:41:08.473037957 +0200
|
||||
@@ -2706,7 +2706,7 @@
|
||||
+
|
||||
# Location of GPG executable (used only for releases)
|
||||
gpg.exec=/path/to/gpg
|
||||
|
||||
Index: apache-tomcat-8.0.32-src/build.xml
|
||||
===================================================================
|
||||
--- apache-tomcat-8.0.32-src.orig/build.xml
|
||||
+++ apache-tomcat-8.0.32-src/build.xml
|
||||
@@ -2844,7 +2844,7 @@ skip.installer property in build.propert
|
||||
</target>
|
||||
|
||||
<target name="download-dist"
|
||||
|
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 17 18:12:57 UTC 2016 - tchvatal@suse.com
|
||||
|
||||
- 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
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 10 09:20:40 UTC 2015 - dmacvicar@suse.de
|
||||
|
||||
|
31
tomcat.spec
31
tomcat.spec
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user