diff --git a/tomcat-serverxml-tool.tar.gz b/tomcat-serverxml-tool.tar.gz index d151cd3..45b7610 100644 --- a/tomcat-serverxml-tool.tar.gz +++ b/tomcat-serverxml-tool.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c28653dcbbfbd98ea22f58ac537d5ca3667dcad0897321129d10ff7869affc63 -size 2352 +oid sha256:345bbc4b2ab711d90c9c182fc1d09d0664f1421499d741f1ae1c6ad602ce2f67 +size 1969 diff --git a/tomcat.changes b/tomcat.changes index b2d654b..9b605ac 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Feb 19 17:22:16 UTC 2019 - malbu@suse.com + +- Don't overwrite changes made to server.xml contexts when updating + bundled webapps. + +------------------------------------------------------------------- +Mon Feb 18 15:55:12 UTC 2019 - malbu@suse.com + +- Set javac target to 1.8 when building docs samples and serverxmltool + ------------------------------------------------------------------- Tue Feb 5 09:50:35 UTC 2019 - malbu@suse.com diff --git a/tomcat.spec b/tomcat.spec index 1d49355..a82a600 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -37,6 +37,7 @@ %define workdir %{cachedir}/work %define tomcatappdir %{_datadir}/%{name}/tomcat-webapps %define serverxmltool %{_libexecdir}/%{name}/serverxml-tool.sh +%define javac_target 1.8 #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} %define _fillupdir %{_localstatedir}/adm/fillup-templates @@ -79,8 +80,6 @@ Source1002: %{name}.keyring Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch #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: %{name}-%{major_version}.%{minor_version}-property-build.windows.patch # PATCH-FIX-UPSTREAM: https://issues.apache.org/bugzilla/show_bug.cgi?id=56373 Patch2: %{name}-%{major_version}.%{minor_version}-JDTCompiler-java.patch # PATCH-FIX-SLE: Change security manager default policies bnc#891264 @@ -104,7 +103,7 @@ BuildRequires: geronimo-jaxrpc-1_1-api BuildRequires: geronimo-qname-1_1-api BuildRequires: geronimo-saaj-1_1-api BuildRequires: jakarta-taglibs-standard >= 1.1 -BuildRequires: java-devel >= 1.8 +BuildRequires: java-devel >= 1.8.0 BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: junit @@ -141,25 +140,25 @@ released under the Apache Software License version 2.0. Tomcat is intended to be a collaboration of the best-of-breed developers from around the world. -ATTENTION-> This tomcat is build with java 1.8.0 +ATTENTION: This tomcat is built with java 1.8.0. %package admin-webapps -Summary: The host-manager and manager web applications for Apache Tomcat +Summary: The host manager and manager web applications for Apache Tomcat Group: Productivity/Networking/Web/Servers Requires: %{name} = %{version}-%{release} %description admin-webapps -The host-manager and manager web based applications for Apache Tomcat. +The host manager and manager web-based applications for Apache Tomcat. %package embed Summary: Libraries for Embedding Apache Tomcat Group: Productivity/Networking/Web/Servers %description embed -Embedded support (various Libraries) for Apache Tomcat +Embeddeding support (various libraries) for Apache Tomcat. %package docs-webapp -Summary: The docs web application for Apache Tomcat +Summary: The "docs" web application for Apache Tomcat Group: Productivity/Networking/Web/Servers Requires: %{name} = %{version}-%{release} @@ -182,7 +181,7 @@ Expression Language API version 3.0. %package javadoc Summary: Javadoc generated documentation for Apache Tomcat -Group: Productivity/Networking/Web/Servers +Group: Documentation/HTML %description javadoc Javadoc generated documentation files for Apache Tomcat. @@ -254,12 +253,11 @@ Requires: jakarta-taglibs-standard >= 1.1 The ROOT and examples web applications for Apache Tomcat %prep -%setup -q -n %{packdname} -%setup -q -D -T -n %{packdname} -b 33 +%setup -q -n %{packdname} -b33 # remove pre-built binaries and windows files find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \ - -name "*.jar" -o -name "*.war" -o -name "*.zip" \) | xargs -t rm -f + -name "*.jar" -o -name "*.war" -o -name "*.zip" \) -print -delete %patch0 %patch1 %patch2 @@ -313,7 +311,7 @@ rm output/build/bin/commons-daemon.jar \ pushd output/dist/src/webapps/docs/appdev/sample/src mkdir -p ../web/WEB-INF/classes -javac -cp ../../../../../../../../output/build/lib/servlet-api.jar -d ../web/WEB-INF/classes mypackage/Hello.java +javac -source %{javac_target} -target %{javac_target} -cp ../../../../../../../../output/build/lib/servlet-api.jar -d ../web/WEB-INF/classes mypackage/Hello.java pushd ../web jar cf ../../../../../../../../output/build/webapps/docs/appdev/sample/sample.war * popd @@ -329,7 +327,7 @@ jar ufm output/build/lib/tomcat-api.jar %{SOURCE15} jar ufm output/build/bin/tomcat-juli.jar %{SOURCE16} pushd %{_builddir}/tomcat-serverxml-tool -javac com/suse/tcserverxml/ApplyStylesheet.java +javac -source %{javac_target} -target %{javac_target} com/suse/tcserverxml/ApplyStylesheet.java jar cfe serverxmltool.jar com.suse.tcserverxml.ApplyStylesheet com/suse/tcserverxml/ApplyStylesheet.class com/suse/tcserverxml/add-context.xslt com/suse/tcserverxml/remove-context.xslt popd