Hello community, here is the log from the commit of package tomcat for openSUSE:Factory checked in at 2015-06-02 10:09:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tomcat (Old) and /work/SRC/openSUSE:Factory/.tomcat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tomcat" Changes: -------- --- /work/SRC/openSUSE:Factory/tomcat/tomcat.changes 2015-04-02 15:59:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tomcat.new/tomcat.changes 2015-06-02 10:09:55.000000000 +0200 @@ -1,0 +2,17 @@ +Mon Jun 1 09:08:36 UTC 2015 - [email protected] + +- Some whitespace cleanups + +------------------------------------------------------------------- +Mon Jun 1 09:07:45 UTC 2015 - [email protected] + +- Remove pointless conflicts on provide/obsolete symbols + +------------------------------------------------------------------- +Mon Jun 1 08:54:33 UTC 2015 - [email protected] + +- Version bump to 8.0.23: + * Multiple testfixes all around, read upstream changelog at: + http://tomcat.apache.org/tomcat-8.0-doc/changelog.html#Tomcat_8.0.23_(markt) + +------------------------------------------------------------------- @@ -14,0 +32,17 @@ + +------------------------------------------------------------------- +Tue Feb 10 10:12:38 UTC 2015 - [email protected] + +- update to Tomcat 8.0.18: + * Major update for tomcat8 from tomcat7 + * For full changelog please read upstream changes at: + + http://tomcat.apache.org/tomcat-8.0-doc/changelog.html + * Rename all tomcat-7.0-* files to tomcat-8.0-* + * Update keyring file +- Update windows patch to apply again: + * Deleted: tomcat-7.0.52-property-build.windows.patch + * Added: tomcat-8.0.9-property-build.windows.patch + * Added:tomcat-8.0-tomcat-users-webapp.patch + * Deleted: tomcat-7.0-tomcat-users-webapp.patch + * Added: tomcat-8.0-bootstrap-MANIFEST.MF.patch + * Deleted: tomcat-7.0-bootstrap-MANIFEST.MF.patch Old: ---- apache-tomcat-7.0.55-src.tar.gz apache-tomcat-7.0.55-src.tar.gz.asc tomcat-7.0-bootstrap-MANIFEST.MF.patch tomcat-7.0-digest.script tomcat-7.0-log4j.properties tomcat-7.0-tomcat-users-webapp.patch tomcat-7.0-tool-wrapper.script tomcat-7.0.52-property-build.windows.patch tomcat-7.0.conf tomcat-7.0.init tomcat-7.0.logrotate tomcat-7.0.wrapper New: ---- apache-tomcat-8.0.23-src.tar.gz apache-tomcat-8.0.23-src.tar.gz.asc tomcat-8.0-bootstrap-MANIFEST.MF.patch tomcat-8.0-digest.script tomcat-8.0-log4j.properties tomcat-8.0-tomcat-users-webapp.patch tomcat-8.0-tool-wrapper.script tomcat-8.0.9-property-build.windows.patch tomcat-8.0.conf tomcat-8.0.init tomcat-8.0.logrotate tomcat-8.0.wrapper ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomcat.spec ++++++ --- /var/tmp/diff_new_pack.5BuUzR/_old 2015-06-02 10:09:57.000000000 +0200 +++ /var/tmp/diff_new_pack.5BuUzR/_new 2015-06-02 10:09:57.000000000 +0200 @@ -18,12 +18,12 @@ %global with_systemd 0%{?suse_version} > 1210 -%define jspspec 2.2 -%define servletspec 3.0 -%define elspec 2.2 -%define major_version 7 +%define jspspec 2.3 +%define servletspec 3.1 +%define elspec 3.0 +%define major_version 8 %define minor_version 0 -%define micro_version 55 +%define micro_version 23 %define packdname apache-tomcat-%{version}-src # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/ %define appdir /srv/%{name}/webapps @@ -38,7 +38,7 @@ Name: tomcat Version: %{major_version}.%{minor_version}.%{micro_version} Release: 0 -Summary: Apache Servlet/JSP Engine, RI for Servlet 3.0/JSP 2.2 API +Summary: Apache Servlet/JSP/EL Engine, RI for Servlet 3.1/JSP 2.3/EL 3.0 API License: Apache-2.0 Group: Productivity/Networking/Web/Servers Url: http://tomcat.apache.org @@ -69,7 +69,7 @@ #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-7.0.52-property-build.windows.patch +Patch2: tomcat-8.0.9-property-build.windows.patch # PATCH-FIX-UPSTREAM: https://issues.apache.org/bugzilla/show_bug.cgi?id=56373 Patch3: tomcat-7.0.53-JDTCompiler-java.patch # PATCH-FIX-SLE: Change security manager default policies bnc#891264 @@ -152,17 +152,18 @@ %description docs-webapp The documentation of web application for Apache Tomcat. -%package el-2_2-api -Summary: Expression Language v2.2 API +%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 Provides: %{name}-el-%{elspec}-api = %{version}-%{release} -Provides: el_2_2_api = %{version}-%{release} +Provides: el_3_0_api = %{version}-%{release} Provides: el_api = %{elspec} +Obsoletes: el_api < %{elspec} -%description el-2_2-api -Expression Language API version 2.2. +%description el-3_0-api +Expression Language API version 3.0. %package javadoc Summary: Javadoc generated documentation for Apache Tomcat @@ -171,7 +172,7 @@ %description javadoc Javadoc generated documentation files for Apache Tomcat. -%package jsp-2_2-api +%package jsp-2_3-api Summary: Apache Tomcat JSP API implementation classes Group: Productivity/Networking/Web/Servers Requires: %{name}-servlet-%{servletspec}-api = %{version}-%{release} @@ -179,13 +180,13 @@ Requires(postun): %{_sbindir}/update-alternatives Provides: %{name}-jsp-%{jspspec}-api Provides: jsp = %{jspspec} -Provides: jsp22 +Provides: jsp23 +Obsoletes: jsp < %{jspspec} -%description jsp-2_2-api -Apache Tomcat JSP API implementation classes version 2.2 +%description jsp-2_3-api +Apache Tomcat JSP API implementation classes version 2.3 %if %{with_systemd} - %package jsvc Summary: Apache jsvc wrapper for Apache Tomcat as separate service Group: Productivity/Networking/Web/Servers @@ -213,18 +214,19 @@ %description lib Libraries required to successfully run the Tomcat Web container -%package servlet-3_0-api +%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 Provides: %{name}-servlet-%{servletspec}-api = %{version}-%{release} Provides: servlet = %{servletspec} -Provides: servlet30 +Provides: servlet31 Provides: servlet7 +Obsoletes: servlet < %{servletspec} -%description servlet-3_0-api -Apache Tomcat Servlet API implementation classes version 3.0 +%description servlet-3_1-api +Apache Tomcat Servlet API implementation classes version 3.1 %package webapps Summary: ROOT and examples web applications for Apache Tomcat @@ -284,7 +286,6 @@ -Dcommons-daemon.native.src.tgz="HACK" \ -Djasper-jdt.jar="$(build-classpath ecj)" \ -Djdt.jar="$(build-classpath ecj)" \ - -Dtomcat-dbcp.jar="$(build-classpath commons-dbcp)" \ -Dtomcat-native.tar.gz="HACK" \ -Dtomcat-native.home="." \ -Dcommons-daemon.native.win.mgr.exe="HACK" \ @@ -296,12 +297,11 @@ -Dno.build.dbcp=true \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ - deploy dist-prepare dist-source javadoc package-java7 embed-jars + deploy dist-prepare dist-source javadoc package embed-jars # remove some jars that we'll replace with symlinks later rm output/build/bin/commons-daemon.jar \ - output/build/lib/ecj.jar \ - output/build/lib/*commons-dbcp.jar + output/build/lib/ecj.jar # remove the cruft we created rm output/build/bin/tomcat-native.tar.gz @@ -471,7 +471,7 @@ # install sample webapp mkdir -p %{buildroot}%{appdir}/sample pushd %{buildroot}%{appdir}/sample -%{jar} xf %{buildroot}%{appdir}/docs/appdev/sample/sample.war +%jar xf %{buildroot}%{appdir}/docs/appdev/sample/sample.war popd # Allow linking for example webapp @@ -534,11 +534,8 @@ 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 tomcat7-websocket.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat7-websocket.pom -%add_maven_depmap JPP.%{name}-tomcat7-websocket.pom %{name}/tomcat7-websocket.jar - -cp -a tomcat7-embed-websocket.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat7-embed-websocket.pom -%add_maven_depmap JPP.%{name}-tomcat7-embed-websocket.pom %{name}/tomcat7-embed-websocket.jar +cp -a tomcat-websocket.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-websocket.pom +%add_maven_depmap JPP.%{name}-tomcat-websocket.pom %{name}/tomcat-websocket.jar cp -a tomcat-embed-core.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-core.pom %add_maven_depmap JPP.%{name}-tomcat-embed-core.pom %{name}/tomcat-embed-core.jar @@ -555,8 +552,8 @@ 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 tomcat7-embed-websocket.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat7-embed-websocket.pom -%add_maven_depmap JPP.%{name}-tomcat7-embed-websocket.pom %{name}/tomcat7-embed-websocket.jar +cp -a tomcat-embed-websocket.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-websocket.pom +%add_maven_depmap JPP.%{name}-tomcat-embed-websocket.pom %{name}/tomcat-embed-websocket.jar # replace temporary copy with link ln -s -f %{bindir}/tomcat-juli.jar %{buildroot}%{libdir}/ @@ -616,7 +613,6 @@ %endif %if %{with_systemd} - %pre jsvc %service_add_pre %{name}-jsvc.service @@ -630,31 +626,31 @@ %service_del_postun %{name}-jsvc.service %endif -%post el-2_2-api +%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 -%preun el-2_2-api +%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 fi -%post jsp-2_2-api +%post jsp-2_3-api %{_sbindir}/update-alternatives --install %{_javadir}/jsp.jar jsp \ %{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20200 -%postun jsp-2_2-api +%postun jsp-2_3-api if [ $1 -eq 0 ] ; then %{_sbindir}/update-alternatives --remove jsp \ %{_javadir}/%{name}-jsp-%{jspspec}-api.jar fi -%post servlet-3_0-api +%post servlet-3_1-api %{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet \ %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 30000 -%postun servlet-3_0-api +%postun servlet-3_1-api if [ $1 -eq 0 ] ; then %{_sbindir}/update-alternatives --remove servlet \ %{_javadir}/%{name}-servlet-%{servletspec}-api.jar @@ -723,7 +719,7 @@ %defattr(-,root,root) %doc %{appdir}/docs -%files el-2_2-api +%files el-3_0-api %defattr(-,root,root) %{_javadir}/%{name}-el-%{elspec}-api.jar %{_javadir}/%{name}-el-api.jar @@ -739,7 +735,7 @@ %defattr(-,root,root) %doc %{_javadocdir}/%{name} -%files jsp-2_2-api +%files jsp-2_3-api %defattr(0644,root,root,0755) %{_javadir}/%{name}-jsp-%{jspspec}-api.jar %{_javadir}/%{name}-jsp-api.jar @@ -764,7 +760,7 @@ %{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom %{_mavenpomdir}/JPP.%{name}-tomcat-coyote.pom %{_mavenpomdir}/JPP.%{name}-tomcat-util.pom -%{_mavenpomdir}/JPP.%{name}-tomcat7-websocket.pom +%{_mavenpomdir}/JPP.%{name}-tomcat-websocket.pom %{_mavenpomdir}/JPP.%{name}-websocket-api.pom %exclude %{libdir}/%{name}-el-%{elspec}-api.jar %exclude %{libdir}/%{name}*-embed-*.jar @@ -776,13 +772,13 @@ %defattr(-,root,root) %dir %{libdir} %{libdir}/%{name}*-embed-*.jar -%{_mavenpomdir}/JPP.%{name}-tomcat7-embed-websocket.pom +%{_mavenpomdir}/JPP.%{name}-tomcat-embed-websocket.pom %{_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_0-api +%files servlet-3_1-api %defattr(-,root,root) %doc LICENSE %{_javadir}/%{name}-servlet-%{servletspec}-api.jar @@ -800,7 +796,6 @@ %{appdir}/sample %if %{with_systemd} - %files jsvc %defattr(755,root,root,0755) %{_sbindir}/%{name}-jsvc-sysd ++++++ apache-tomcat-7.0.55-src.tar.gz -> apache-tomcat-8.0.23-src.tar.gz ++++++ ++++ 419597 lines of diff (skipped) ++++++ tomcat-7.0-bootstrap-MANIFEST.MF.patch -> tomcat-8.0-bootstrap-MANIFEST.MF.patch ++++++ ++++++ tomcat-7.0-digest.script -> tomcat-8.0-digest.script ++++++ ++++++ tomcat-7.0-log4j.properties -> tomcat-8.0-log4j.properties ++++++ ++++++ tomcat-7.0-tomcat-users-webapp.patch -> tomcat-8.0-tomcat-users-webapp.patch ++++++ ++++++ tomcat-7.0-tool-wrapper.script -> tomcat-8.0-tool-wrapper.script ++++++ ++++++ tomcat-7.0.52-property-build.windows.patch -> tomcat-8.0.9-property-build.windows.patch ++++++ --- /work/SRC/openSUSE:Factory/tomcat/tomcat-7.0.52-property-build.windows.patch 2014-05-26 14:44:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tomcat.new/tomcat-8.0.9-property-build.windows.patch 2015-06-02 10:09:55.000000000 +0200 @@ -1,17 +1,17 @@ -diff -Naur apache-tomcat-7.0.52-src.orig/build.properties.default apache-tomcat-7.0.52-src/build.properties.default ---- apache-tomcat-7.0.52-src.orig/build.properties.default 2014-02-13 08:40:56.000000000 +0100 -+++ apache-tomcat-7.0.52-src/build.properties.default 2014-03-14 23:21:06.654533928 +0100 -@@ -217,3 +217,6 @@ - cobertura.jar=${cobertura.home}/cobertura-${cobertura.version}.jar - cobertura.lib=${cobertura.home}/lib - cobertura.loc=${base-sf.loc}/cobertura/cobertura-2.0.3-bin.tar.gz +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 + java.net.preferIPv4Stack=false + +# ----- Build on Windows ---- +build.windows=false -diff -Naur apache-tomcat-7.0.52-src.orig/build.xml apache-tomcat-7.0.52-src/build.xml ---- apache-tomcat-7.0.52-src.orig/build.xml 2014-02-13 08:40:56.000000000 +0100 -+++ apache-tomcat-7.0.52-src/build.xml 2014-03-14 23:17:02.778479339 +0100 -@@ -2702,7 +2702,7 @@ +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 @@ </target> <target name="download-dist" ++++++ tomcat-7.0.conf -> tomcat-8.0.conf ++++++ ++++++ tomcat-7.0.init -> tomcat-8.0.init ++++++ ++++++ tomcat-7.0.logrotate -> tomcat-8.0.logrotate ++++++ ++++++ tomcat-7.0.wrapper -> tomcat-8.0.wrapper ++++++ ++++++ tomcat.keyring ++++++ ++++ 648 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/tomcat/tomcat.keyring ++++ and /work/SRC/openSUSE:Factory/.tomcat.new/tomcat.keyring
