Hello community,
here is the log from the commit of package tomcat for openSUSE:Factory checked in at 2013-11-15 13:39:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2013-09-11 17:11:47.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.tomcat.new/tomcat.changes 2013-11-15 13:39:09.000000000 +0100
@@ -1,0 +2,14 @@
+Mon Nov 4 14:12:40 UTC 2013 - mvyskocil@suse.com
+
+- Update to 4.0.47
+ * bugfix release
+ * backport of JSR-356 Java WebSocket 1.0
+ * package tomcat now requires java7 at lease
+- Updated tomcat.keyring to reflect the fact new release is signed by
+ Violeta Georgieva / D63011C7
+ see http://osdir.com/ml/dev-tomcat.apache.org/2013-10/msg00849.html
+- Add tomcat-dbcp.jar (bnc#847505) back into tomcat lib dir
+- Install tomcat-coyote.jar as well
+- Remove pointless scriplets
+
+-------------------------------------------------------------------
Old:
----
apache-tomcat-7.0.42-src.tar.gz
apache-tomcat-7.0.42-src.tar.gz.asc
New:
----
apache-tomcat-7.0.47-src.tar.gz
apache-tomcat-7.0.47-src.tar.gz.asc
collections-tomcat-build.xml
dbcp-tomcat-build.xml
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tomcat.spec ++++++
--- /var/tmp/diff_new_pack.zIiDJS/_old 2013-11-15 13:39:10.000000000 +0100
+++ /var/tmp/diff_new_pack.zIiDJS/_new 2013-11-15 13:39:10.000000000 +0100
@@ -26,7 +26,7 @@
%define major_version 7
%define minor_version 0
-%define micro_version 42
+%define micro_version 47
%define packdname apache-tomcat-%{version}-src
%define tcuid 91
@@ -70,6 +70,7 @@
Source16: tomcat-juli-OSGi-MANIFEST.MF
Source17: tomcat-7.0-tomcat-sysd
Source20: tomcat-7.0-jsvc.service
+Source30: dbcp-tomcat-build.xml
Source1000: tomcat-rpmlintrc
Source1001: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz.asc
Source1002: %{name}.keyring
@@ -95,9 +96,11 @@
BuildRequires: jakarta-commons-collections
BuildRequires: jakarta-commons-daemon
BuildRequires: jakarta-commons-dbcp
+BuildRequires: jakarta-commons-dbcp-src
BuildRequires: jakarta-commons-pool
+BuildRequires: jakarta-commons-pool-tomcat5
BuildRequires: jakarta-taglibs-standard >= 1.1
-BuildRequires: java-devel >= 1.6.0
+BuildRequires: java-devel >= 1.7.0
BuildRequires: javapackages-tools
BuildRequires: javapackages-tools
BuildRequires: junit
@@ -217,10 +220,11 @@
Requires: %{name}-jsp-%{jspspec}-api = %{version}-%{release}
Requires: %{name}-servlet-%{servletspec}-api = %{version}-%{release}
Requires(post): ecj >= 4.2.1
-#Requires(post): jakarta-commons-collections-tomcat5
-#$Requires(post): jakarta-commons-dbcp-tomcat5
-#Requires(post): jakarta-commons-pool-tomcat5
+#Requires(post): jakarta-commons-dbcp-tomcat5
+Requires(post): jakarta-commons-pool-tomcat5
Requires(preun):%{__rm}
+Provides: jakarta-commons-dbcp-tomcat5 = 1.4
+Obsoletes: jakarta-commons-dbcp-tomcat5 < 1.4
%description lib
Libraries needed to run the Tomcat Web container
@@ -251,8 +255,6 @@
%description webapps
The ROOT and examples web applications for Apache Tomcat
-
-
%prep
%if 0%{?suse_version} > 1220
@@ -268,6 +270,18 @@
%patch2 -p1
%build
+#bnc847505: build all commons-dbcp-tomcat jars before tomcat
+# so we broke the build cycle between commons-dbcp and tomcat
+
+mkdir -p commons/dbcp
+pushd commons/dbcp
+cp %{SOURCE30} .
+mkdir src
+cp -r %{_usrsrc}/commons-dbcp/java src/
+export CLASSPATH=$(build-classpath commons-pool-tomcat5)
+ant -f dbcp-tomcat-build.xml
+popd
+
%{__ln_s} $(build-classpath jakarta-taglibs-core) webapps/examples/WEB-INF/lib/jstl.jar
%{__ln_s} $(build-classpath jakarta-taglibs-standard) webapps/examples/WEB-INF/lib/standard.jar
@@ -283,6 +297,7 @@
touch HACKDIR/build.xml
%{ant} -Dbase.path="." \
+ -Djava.7.home="%{java_home}" \
-Dbuild.compiler="modern" \
-Dcommons-collections.jar="$(build-classpath commons-collections)" \
-Dcommons-daemon.jar="$(build-classpath commons-daemon)" \
@@ -301,12 +316,12 @@
-Dno.build.dbcp=true \
-Dversion="%{version}" \
-Dversion.build="%{micro_version}" \
- deploy dist-prepare dist-source javadoc
+ deploy dist-prepare dist-source javadoc package-java7
# 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/*commons-dbcp.jar
# remove the cruft we created
%{__rm} output/build/bin/tomcat-native.tar.gz
@@ -378,6 +393,8 @@
%{__cp} -a lib/*.jar %{buildroot}%{libdir}
%{__cp} -a webapps/* %{buildroot}%{appdir}
popd
+# bnc#847505: add missing tomcat-dbcp.jar
+%{__cp} -a commons/dbcp/dbcp-tomcat5/commons-dbcp-tomcat5.jar %{buildroot}/%{libdir}/tomcat-dbcp.jar
# javadoc
%{__cp} -a output/dist/webapps/docs/api/* %{buildroot}%{_javadocdir}/%{name}
@@ -472,6 +489,19 @@
pushd %{buildroot}%{appdir}/sample
%{jar} xf %{buildroot}%{appdir}/docs/appdev/sample/sample.war
popd
+
+# Allow linking for example webapp
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{appdir}/examples/META-INF
+pushd ${RPM_BUILD_ROOT}%{appdir}/examples/META-INF
+echo '<?xml version="1.0" encoding="UTF-8"?>'>context.xml
+echo '<Context allowLinking="true"/>'>>context.xml
+popd
+
+pushd ${RPM_BUILD_ROOT}%{appdir}/examples/WEB-INF/lib
+%{__ln_s} -f $(build-classpath jakarta-taglibs-core) jstl.jar
+%{__ln_s} -f $(build-classpath jakarta-taglibs-standard) standard.jar
+popd
+
%{__rm} %{buildroot}%{appdir}/docs/appdev/sample/sample.war
# Install the maven metadata
@@ -505,6 +535,9 @@
%{__cp} -a tomcat-tribes.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom
%add_maven_depmap JPP.%{name}-catalina-tribes.pom %{name}/catalina-tribes.jar
+%{__cp} -a tomcat-coyote.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-coyote.pom
+%add_maven_depmap JPP.%{name}-tomcat-coyote.pom %{name}/tomcat-coyote.jar
+
%{__cp} -a tomcat-juli.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom
%add_maven_depmap JPP.%{name}-tomcat-juli.pom %{name}/tomcat-juli.jar
@@ -611,24 +644,12 @@
fi
%post lib
-# HACK! The commons-dbcp-tomcat5 needs the tomcat-lib to build, but tomcat
-# needs this only as post/un dependency to create a symlink, not for build of
-# itself. This is mainly for succesfully build, in the production case it
-# should not happen!
-build-jar-repository %{libdir} \
- commons-collections-tomcat5 \
- commons-dbcp-tomcat5 \
- commons-pool-tomcat5 \
- ecj 2>&1 || exit 0
-
-%preun lib
-if [ "$1" = "0" ]; then
- %{__rm} -f \
+# those links are no longer needed
+%{__rm} -f \
%{libdir}/\[commons-collections-tomcat5\].jar \
%{libdir}/\[commons-dbcp-tomcat5\].jar \
%{libdir}/\[commons-pool-tomcat5\].jar \
%{libdir}/\[ecj\].jar >/dev/null 2>&1
-fi
%files
%defattr(0644,root,root,0755)
@@ -723,6 +744,7 @@
%{_mavenpomdir}/JPP.%{name}-jasper.pom
%{_mavenpomdir}/JPP.%{name}-tomcat-api.pom
%{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom
+%{_mavenpomdir}/JPP.%{name}-tomcat-coyote.pom
%{_mavenpomdir}/JPP.%{name}-tomcat-util.pom
%exclude %{libdir}/%{name}-el-%{elspec}-api.jar
# bnc#418664
++++++ apache-tomcat-7.0.42-src.tar.gz -> apache-tomcat-7.0.47-src.tar.gz ++++++
++++ 41552 lines of diff (skipped)
++++++ collections-tomcat-build.xml ++++++
<project name="commons-collections-tomcat5" default="build" basedir=".">
<property name="tomcat-collections.home" value="collections-tomcat5"/>
<property name="commons-collections.home" value="."/>
<property name="tomcat-collections.jar" value="commons-collections-tomcat5.jar"/>
<!-- Java Options -->
<property name="compile.debug" value="true"/>
<property name="compile.deprecation" value="false"/>
<property name="compile.source" value="1.4"/>
<target name="clean">
<delete dir="${tomcat-collections.home}"/>
</target>
<target name="build">
<copy todir="${tomcat-collections.home}">
<fileset dir="${commons-collections.home}" >
<include name="**/collections/CursorableLinkedList.java" />
<include name="**/collections/KeyValue.java" />
<include name="**/collections/LRUMap.java" />
<include name="**/collections/SequencedHashMap.java" />
</fileset>
<!-- <fileset dir="${commons-pool.home}">
<include name="**/*.java" />
<exclude name="**/Stack*.java" />
<exclude name="**/SoftReferenceObjectPool.java" />
<exclude name="**/test/**" />
</fileset>
<fileset dir="${commons-dbcp.home}">
<include name="**/*.java" />
<exclude name="**/test/**" />
<exclude name="${tomcat-dbcp.home}/**"/>
</fileset> -->
</copy>
<replace dir="${tomcat-collections.home}/src/java/org/apache/commons">
<replacefilter token="return UnmodifiableList.decorate(l);"
value="return l;" />
<replacefilter token="import org.apache.commons.collections.list.UnmodifiableList;"
value=" " />
</replace>
<replace dir="${tomcat-collections.home}/src/java/org/apache/commons" >
<replacefilter token="org.apache.commons"
value="org.apache.tomcat.dbcp" />
</replace>
<mkdir dir="${tomcat-collections.home}/src/java/org/apache/tomcat/dbcp" />
<move todir="${tomcat-collections.home}/src/java/org/apache/tomcat/dbcp">
<fileset dir="${tomcat-collections.home}/src/java/org/apache/commons" />
</move>
<mkdir dir="${tomcat-collections.home}/classes"/>
<javac destdir="${tomcat-collections.home}/classes"
optimize="off"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
source="${compile.source}"
sourcepath="${tomcat-collections.home}/src/java"
srcdir="${tomcat-collections.home}/src/java" >
<include name="**" />
</javac>
<jar destfile="${tomcat-collections.home}/${tomcat-collections.jar}"
index="true">
<fileset dir="${tomcat-collections.home}/classes">
<include name="**/*.class" />
<include name="**/*.properties" />
</fileset>
</jar>
</target>
</project>
++++++ dbcp-tomcat-build.xml ++++++
<!-- $Id: build.xml,v 1.25 2004/05/20 16:30:30 dirkv Exp $ -->
<project name="commons-dbcp-tomcat5" default="build" basedir=".">
<property name="tomcat-dbcp.home" value="dbcp-tomcat5"/>
<property name="commons-dbcp.home" value="."/>
<property name="tomcat-dbcp.jar" value="commons-dbcp-tomcat5.jar"/>
<!-- Java Options -->
<property name="compile.debug" value="true"/>
<property name="compile.deprecation" value="false"/>
<property name="compile.source" value="1.5"/>
<target name="clean">
<delete dir="${tomcat-dbcp.home}"/>
</target>
<target name="build">
<copy todir="${tomcat-dbcp.home}">
<!-- <fileset dir="${commons-collections.home}" >
<include name="**/collections/CursorableLinkedList.java" />
<include name="**/collections/KeyValue.java" />
<include name="**/collections/LRUMap.java" />
<include name="**/collections/SequencedHashMap.java" />
</fileset>
<fileset dir="${commons-pool.home}">
<include name="**/*.java" />
<exclude name="**/Stack*.java" />
<exclude name="**/SoftReferenceObjectPool.java" />
<exclude name="**/test/**" />
</fileset> -->
<fileset dir="${commons-dbcp.home}">
<include name="**/*.java" />
<exclude name="**/test/**" />
<exclude name="${tomcat-dbcp.home}/**"/>
</fileset>
</copy>
<replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons">
<replacefilter token="return UnmodifiableList.decorate(l);"
value="return l;" />
<replacefilter token="import org.apache.commons.collections.list.UnmodifiableList;"
value=" " />
</replace>
<replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons" >
<replacefilter token="org.apache.commons"
value="org.apache.tomcat.dbcp" />
</replace>
<mkdir dir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp" />
<move todir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp">
<fileset dir="${tomcat-dbcp.home}/src/java/org/apache/commons" />
</move>
<mkdir dir="${tomcat-dbcp.home}/classes"/>
<javac target="1.5" destdir="${tomcat-dbcp.home}/classes"
optimize="off"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
source="${compile.source}"
sourcepath="${tomcat-dbcp.home}/src/java"
srcdir="${tomcat-dbcp.home}/src/java" >
<include name="**" />
</javac>
<jar destfile="${tomcat-dbcp.home}/${tomcat-dbcp.jar}"
index="true">
<fileset dir="${tomcat-dbcp.home}/classes">
<include name="**/*.class" />
<include name="**/*.properties" />
</fileset>
</jar>
</target>
</project>
++++++ tomcat-7.0.service ++++++
--- /var/tmp/diff_new_pack.zIiDJS/_old 2013-11-15 13:39:11.000000000 +0100
+++ /var/tmp/diff_new_pack.zIiDJS/_new 2013-11-15 13:39:11.000000000 +0100
@@ -18,6 +18,7 @@
StandardOutput=syslog
SyslogIdentifier=%n
SyslogFacility=daemon
+SuccessExitStatus=143
[Install]
WantedBy=multi-user.target
++++++ tomcat.keyring ++++++
--- /var/tmp/diff_new_pack.zIiDJS/_old 2013-11-15 13:39:11.000000000 +0100
+++ /var/tmp/diff_new_pack.zIiDJS/_new 2013-11-15 13:39:11.000000000 +0100
@@ -1,55 +1,56 @@
-pub 4096R/2F6059E7 2009-09-18
-uid Mark E D Thomas