Accepting request 547624 from home:mateialbu:branches:Java:packages
- Update to Tomcat 9.0.2:
* Major update for tomcat8 from tomcat9
* For full changelog please read upstream changes at:
+ http://tomcat.apache.org/tomcat-9.0-doc/changelog.html
* Rename all tomcat-8.0-* files to tomcat-9.0-*
- Changed patches:
* Deleted: tomcat-8.0-bootstrap-MANIFEST.MF.patch
* Deleted: tomcat-8.0-sle.catalina.policy.patch
* Deleted: tomcat-8.0-tomcat-users-webapp.patch
* Deleted: tomcat-8.0.33-JDTCompiler-java.patch
* Deleted: tomcat-8.0.44-javadoc.patch
* Deleted: tomcat-8.0.9-property-build.windows.patch
* Added: tomcat-9.0-JDTCompiler-java.patch
* Added: tomcat-9.0-bootstrap-MANIFEST.MF.patch
* Added: tomcat-9.0-javadoc.patch
* Added: tomcat-9.0-sle.catalina.policy.patch
* Added: tomcat-9.0-tomcat-users-webapp.patch
- Renamed subpackage tomcat-3_1-api to tomcat-4_0-api
- Commented out JAVA_HOME in /etc/tomcat/tomcat.conf
- Marked /usr/share/java/*.jar symlinks to /etc/alternatives
as %ghost
OBS-URL: https://build.opensuse.org/request/show/547624
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=115
This commit is contained in:
Matei Albu
committed by
Git OBS Bridge
Git OBS Bridge
parent
7e1ec194df
commit
4851db8aac
45
tomcat.spec
45
tomcat.spec
@@ -23,11 +23,11 @@
|
||||
%endif
|
||||
|
||||
%define jspspec 2.3
|
||||
%define servletspec 3.1
|
||||
%define servletspec 4.0
|
||||
%define elspec 3.0
|
||||
%define major_version 8
|
||||
%define major_version 9
|
||||
%define minor_version 0
|
||||
%define micro_version 47
|
||||
%define micro_version 2
|
||||
%define packdname apache-tomcat-%{version}-src
|
||||
# FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/
|
||||
%global basedir /srv/%{name}
|
||||
@@ -43,7 +43,7 @@
|
||||
Name: tomcat
|
||||
Version: %{major_version}.%{minor_version}.%{micro_version}
|
||||
Release: 0
|
||||
Summary: Apache Servlet/JSP/EL Engine, RI for Servlet 3.1/JSP 2.3/EL 3.0 API
|
||||
Summary: Apache Servlet/JSP/EL Engine, RI for Servlet 4.0/JSP 2.3/EL 3.0 API
|
||||
License: Apache-2.0
|
||||
Group: Productivity/Networking/Web/Servers
|
||||
Url: http://tomcat.apache.org
|
||||
@@ -77,13 +77,13 @@ Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.
|
||||
#PATCH-FIX-UPSTREAM: from jpackage.org package
|
||||
Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
|
||||
#PATCH-FIX-OPENSUSE: skip few windows specific parts of build
|
||||
Patch2: tomcat-8.0.9-property-build.windows.patch
|
||||
#Patch2: %{name}-%{major_version}.%{minor_version}-property-build.windows.patch
|
||||
# PATCH-FIX-UPSTREAM: https://issues.apache.org/bugzilla/show_bug.cgi?id=56373
|
||||
Patch3: tomcat-8.0.33-JDTCompiler-java.patch
|
||||
# PATCH-FIX-SLE: Change security manager default policies bnc#891264
|
||||
Patch4: tomcat-8.0-sle.catalina.policy.patch
|
||||
Patch2: %{name}-%{major_version}.%{minor_version}-JDTCompiler-java.patch
|
||||
# PATCH-FIX-SLE: Change security manager default policies bnc#891264
|
||||
Patch3: %{name}-%{major_version}.%{minor_version}-sle.catalina.policy.patch
|
||||
# PATCH-FIX-OPENSUSE: build javadoc with the same java source level as the class files
|
||||
Patch5: tomcat-8.0.44-javadoc.patch
|
||||
Patch4: %{name}-%{major_version}.%{minor_version}-javadoc.patch
|
||||
BuildRequires: ant >= 1.8.1
|
||||
BuildRequires: ant-antlr
|
||||
BuildRequires: apache-commons-collections
|
||||
@@ -218,7 +218,7 @@ Obsoletes: jakarta-commons-dbcp-tomcat5 < 1.4
|
||||
%description lib
|
||||
Libraries required to successfully run the Tomcat Web container
|
||||
|
||||
%package servlet-3_1-api
|
||||
%package servlet-4_0-api
|
||||
Summary: Apache Tomcat Servlet API implementation classes
|
||||
Group: Productivity/Networking/Web/Servers
|
||||
Requires(post): update-alternatives
|
||||
@@ -229,8 +229,9 @@ Provides: servlet31
|
||||
Provides: servlet7
|
||||
Obsoletes: servlet < %{servletspec}
|
||||
Obsoletes: tomcat-servlet-3_0-api
|
||||
Obsoletes: tomcat-servlet-3_1-api
|
||||
|
||||
%description servlet-3_1-api
|
||||
%description servlet-4_0-api
|
||||
Apache Tomcat Servlet API implementation classes version 3.1
|
||||
|
||||
%package webapps
|
||||
@@ -249,10 +250,9 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
|
||||
-name "*.jar" -o -name "*.war" -o -name "*.zip" \) | xargs -t rm -f
|
||||
%patch0
|
||||
%patch1
|
||||
%patch2 -p1
|
||||
%patch2
|
||||
%patch3
|
||||
%patch4
|
||||
%patch5 -p1
|
||||
|
||||
# remove date from docs
|
||||
sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl
|
||||
@@ -545,10 +545,6 @@ cp -a tomcat-embed-el.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-e
|
||||
cp -a tomcat-embed-jasper.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-jasper.pom
|
||||
%add_maven_depmap JPP.%{name}-tomcat-embed-jasper.pom %{name}/tomcat-embed-jasper.jar
|
||||
|
||||
cp -a tomcat-embed-logging-juli.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-logging-juli.pom
|
||||
%add_maven_depmap JPP.%{name}-tomcat-embed-logging-juli.pom %{name}/tomcat-embed-logging-juli.jar
|
||||
|
||||
cp -a tomcat-websocket-api.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-websocket-api.pom
|
||||
%add_maven_depmap JPP.%{name}-websocket-api.pom %{name}/websocket-api.jar
|
||||
|
||||
cp -a tomcat-embed-websocket.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-websocket.pom
|
||||
@@ -569,6 +565,13 @@ echo "%{name}/catalina-ant" > %{buildroot}/%{_sysconfdir}/ant.d/catalina-ant
|
||||
#bnc#565901
|
||||
ln -sf %{_sbindir}/%{name} %{buildroot}/%{bindir}/catalina.sh
|
||||
|
||||
# Install update-alternatives content
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
|
||||
ln -s %{_sysconfdir}/alternatives/el_api %{buildroot}%{_javadir}/el_api.jar
|
||||
ln -s %{_sysconfdir}/alternatives/el_1_0_api %{buildroot}%{_javadir}/el_1_0_api.jar
|
||||
ln -s %{_sysconfdir}/alternatives/jsp %{buildroot}%{_javadir}/jsp.jar
|
||||
ln -s %{_sysconfdir}/alternatives/servlet %{buildroot}%{_javadir}/servlet.jar
|
||||
|
||||
mkdir -p %{buildroot}%{_tmpfilesdir}
|
||||
cat > %{buildroot}%{_tmpfilesdir}/%{name}.conf <<EOF
|
||||
f %{_localstatedir}/run/%{name}.pid 0644 tomcat tomcat -
|
||||
@@ -624,11 +627,11 @@ if [ $1 -eq 0 ] ; then
|
||||
%{_javadir}/%{name}-jsp-%{jspspec}-api.jar
|
||||
fi
|
||||
|
||||
%post servlet-3_1-api
|
||||
%post servlet-4_0-api
|
||||
update-alternatives --install %{_javadir}/servlet.jar servlet \
|
||||
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar 30000
|
||||
|
||||
%postun servlet-3_1-api
|
||||
%postun servlet-4_0-api
|
||||
if [ $1 -eq 0 ] ; then
|
||||
update-alternatives --remove servlet \
|
||||
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar
|
||||
@@ -681,6 +684,7 @@ rm -f \
|
||||
%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/server.xml
|
||||
%attr(0660,tomcat,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml
|
||||
%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/web.xml
|
||||
%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/jaspic-providers.xml
|
||||
%dir %{homedir}
|
||||
%{_tmpfilesdir}/%{name}.conf
|
||||
%{bindir}/bootstrap.jar
|
||||
@@ -764,9 +768,8 @@ rm -f \
|
||||
%{_mavenpomdir}/JPP.%{name}-tomcat-embed-core.pom
|
||||
%{_mavenpomdir}/JPP.%{name}-tomcat-embed-el.pom
|
||||
%{_mavenpomdir}/JPP.%{name}-tomcat-embed-jasper.pom
|
||||
%{_mavenpomdir}/JPP.%{name}-tomcat-embed-logging-juli.pom
|
||||
|
||||
%files servlet-3_1-api
|
||||
%files servlet-4_0-api
|
||||
%doc LICENSE
|
||||
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar
|
||||
%{_javadir}/%{name}-servlet-api.jar
|
||||
|
||||
Reference in New Issue
Block a user