Hello community, here is the log from the commit of package tomcat for openSUSE:Factory checked in at 2014-09-09 06:21:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-08-01 19:27:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tomcat.new/tomcat.changes 2014-09-09 06:21:27.000000000 +0200 @@ -1,0 +2,32 @@ +Mon Sep 8 09:01:13 UTC 2014 - [email protected] + +- include the tomcat websocket implementation (tomcat7-websocket) + +------------------------------------------------------------------- +Mon Sep 8 08:23:28 UTC 2014 - [email protected] + +- Update to 7.0.55 + * Update to the Eclipse JDT Compiler 4.4 + * Better error handling when the error occurs after the response + has been committed + * Various improvements to the Mapper including fixing some + concurrency bugs + * See http://tomcat.apache.org/tomcat-7.0-doc/changelog.html + +------------------------------------------------------------------- +Mon Sep 8 07:44:28 UTC 2014 - [email protected] + +- build tomcat-embed as a subpackage + +------------------------------------------------------------------- +Wed Sep 3 14:43:12 UTC 2014 - [email protected] + +- Drop two unused defines + +------------------------------------------------------------------- +Wed Sep 3 10:47:16 UTC 2014 - [email protected] + +- touch the alternatives files to avoid build errors + in older versions + +------------------------------------------------------------------- Old: ---- apache-tomcat-7.0.54-src.tar.gz apache-tomcat-7.0.54-src.tar.gz.asc New: ---- apache-tomcat-7.0.55-src.tar.gz apache-tomcat-7.0.55-src.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomcat.spec ++++++ --- /var/tmp/diff_new_pack.k53SvM/_old 2014-09-09 06:21:28.000000000 +0200 +++ /var/tmp/diff_new_pack.k53SvM/_new 2014-09-09 06:21:28.000000000 +0200 @@ -23,9 +23,8 @@ %define elspec 2.2 %define major_version 7 %define minor_version 0 -%define micro_version 54 +%define micro_version 55 %define packdname apache-tomcat-%{version}-src -%define tcuid 91 # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/ %define appdir /srv/%{name}/webapps %define bindir %{_datadir}/%{name}/bin @@ -36,7 +35,6 @@ %define cachedir %{_localstatedir}/cache/%{name} %define tempdir %{cachedir}/temp %define workdir %{cachedir}/work -%define _initrddir %{_sysconfdir}/init.d Name: tomcat Version: %{major_version}.%{minor_version}.%{micro_version} Release: 0 @@ -140,6 +138,13 @@ %description admin-webapps 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 for Tomcat + %package docs-webapp Summary: The docs web application for Apache Tomcat Group: Productivity/Networking/Web/Servers @@ -294,7 +299,7 @@ -Dno.build.dbcp=true \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ - deploy dist-prepare dist-source javadoc package-java7 + deploy dist-prepare dist-source javadoc package-java7 embed-jars # remove some jars that we'll replace with symlinks later rm output/build/bin/commons-daemon.jar \ @@ -372,6 +377,11 @@ cp -a lib/*.jar %{buildroot}%{libdir} cp -a webapps/* %{buildroot}%{appdir} popd +# tomcat embedded +pushd output/embed + cp -a *.jar %{buildroot}%{libdir} +popd + # bnc#847505: add missing tomcat-dbcp.jar cp -a commons/dbcp/dbcp-tomcat5/commons-dbcp-tomcat5.jar %{buildroot}/%{libdir}/tomcat-dbcp.jar @@ -440,6 +450,7 @@ ln -s ../%{name}-servlet-%{servletspec}-api.jar . ln -s ../%{name}-el-%{elspec}-api.jar . ln -s $(build-classpath commons-collections) commons-collections.jar + rm -f commons-dbcp.jar ln -s $(build-classpath commons-dbcp) commons-dbcp.jar ln -s $(build-classpath commons-pool) commons-pool.jar ln -s $(build-classpath commons-pool-tomcat5) commons-pool-tomcat5.jar @@ -523,6 +534,33 @@ cp -a tomcat-util.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-util.pom %add_maven_depmap JPP.%{name}-tomcat-util.pom %{name}/tomcat-util.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 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-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 + +cp -a tomcat-embed-el.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-el.pom +%add_maven_depmap JPP.%{name}-tomcat-embed-el.pom %{name}/tomcat-embed-el.jar + +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 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 + # replace temporary copy with link ln -s -f %{bindir}/tomcat-juli.jar %{buildroot}%{libdir}/ @@ -540,9 +578,13 @@ # Install update-alternatives content mkdir -p %{buildroot}%{_sysconfdir}/alternatives +touch %{buildroot}%{_sysconfdir}/alternatives/el_api.jar ln -sf %{_sysconfdir}/alternatives/el_api.jar %{buildroot}%{_javadir}/el_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/el_1_0_api.jar ln -sf %{_sysconfdir}/alternatives/el_1_0_api.jar %{buildroot}%{_javadir}/el_1_0_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/jsp.jar ln -sf %{_sysconfdir}/alternatives/jsp.jar %{buildroot}%{_javadir}/jsp.jar +touch %{buildroot}%{_sysconfdir}/alternatives/servlet.jar ln -sf %{_sysconfdir}/alternatives/servlet.jar %{buildroot}%{_javadir}/servlet.jar %pre @@ -725,11 +767,24 @@ %{_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}-websocket-api.pom %exclude %{libdir}/%{name}-el-%{elspec}-api.jar +%exclude %{libdir}/%{name}*-embed-*.jar # bnc#418664 %dir %{_sysconfdir}/ant.d %config(noreplace) %{_sysconfdir}/ant.d/catalina-ant +%files embed +%defattr(-,root,root) +%dir %{libdir} +%{libdir}/%{name}*-embed-*.jar +%{_mavenpomdir}/JPP.%{name}-tomcat7-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 %defattr(-,root,root) %doc LICENSE ++++++ apache-tomcat-7.0.54-src.tar.gz -> apache-tomcat-7.0.55-src.tar.gz ++++++ ++++ 11854 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
