Hello community,
here is the log from the commit of package struts
checked in at Thu Sep 28 20:45:11 CEST 2006.
--------
--- struts/struts.changes 2006-05-24 12:13:05.000000000 +0200
+++ /mounts/work_src_done/STABLE/struts/struts.changes 2006-09-28 18:35:54.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Sep 28 18:34:52 CEST 2006 - skh@suse.de
+
+- add xalan-j2 to BuildRequires and xalan-j2-serializer.jar to
+ build classpath
+- don't use icecream
+- use source="1.4" and target="1.4" for build with java 1.5
+
+-------------------------------------------------------------------
New:
----
struts-java14compat.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ struts.spec ++++++
--- /var/tmp/diff_new_pack.BHl4Xk/_old 2006-09-28 20:44:33.000000000 +0200
+++ /var/tmp/diff_new_pack.BHl4Xk/_new 2006-09-28 20:44:33.000000000 +0200
@@ -9,9 +9,10 @@
#
# norootforbuild
+# icecream 0
Name: struts
-BuildRequires: ant-apache-oro ant-apache-regexp ant-trax antlr jakarta-commons-fileupload jakarta-commons-lang jakarta-commons-validator java2-devel-packages servletapi4
+BuildRequires: ant-apache-oro ant-apache-regexp ant-trax antlr jakarta-commons-fileupload jakarta-commons-lang jakarta-commons-validator java2-devel-packages servletapi4 xalan-j2
%define name struts
%define full_name jakarta-%{name}
%define version 1.2.4
@@ -26,7 +27,7 @@
%define jdkmajorver 1.4
%define legacyver 1.0
Version: 1.2.4
-Release: 23
+Release: 29
Summary: Web application framework
License: Apache
Group: Development/Libraries/Java
@@ -42,6 +43,7 @@
Patch2: %{name}-bug-38374-backport-from-1.2.9.patch
Patch3: %{name}-bug-38534-backport-from-1.2.9.patch
Patch4: %{name}-bug-38749-backport-from-1.2.9.patch
+Patch5: %{name}-java14compat.patch
URL: http://jakarta.apache.org/struts/
Requires: servlet
Recommends: jdbc-stdext
@@ -125,6 +127,7 @@
%patch2
%patch3
%patch4
+%patch5
cp %{SOURCE4} src/share/org/apache/struts/action/
cp %{SOURCE5} src/test/org/apache/struts/mock/
cp %{SOURCE6} src/test/org/apache/struts/util/
@@ -147,7 +150,7 @@
# build struts
mkdir lib
export CLASSPATH=$(build-classpath xml-commons-apis jaxp_parser_impl \
-jaxp_transform_impl servlet antlr commons-digester-rss oro)
+jaxp_transform_impl servlet antlr commons-digester-rss oro xalan-j2-serializer)
#jaxp_transform_impl jdbc-stdext servlet)
#ant -Djdbc20ext.jar=$(find-jar jdbc-stdext) \
ant -Djdbc20ext.jar=/usr/lib/java/jre/lib/rt.jar \
@@ -275,6 +278,11 @@
%{tomcat5ctxdir}/%{name}-*.xml
%changelog -n struts
+* Thu Sep 28 2006 - skh@suse.de
+- add xalan-j2 to BuildRequires and xalan-j2-serializer.jar to
+ build classpath
+- don't use icecream
+- use source="1.4" and target="1.4" for build with java 1.5
* Wed May 24 2006 - dbornkessel@suse.de
- changed hard requirement on jdbc-stdext to 'Recommends', as it is not available on some platforms (s390[x])
Bug 177909
++++++ struts-java14compat.patch ++++++
diff -Naur ../jakarta-struts-1.2.4-src.orig/build-tests.xml ./build-tests.xml
--- ../jakarta-struts-1.2.4-src.orig/build-tests.xml 2004-09-13 02:36:09.000000000 +0200
+++ ./build-tests.xml 2006-09-28 18:06:56.000000000 +0200
@@ -165,7 +165,9 @@
destdir="${out.test.dir}/classes"
debug="${compile.debug}"
optimize="${compile.optimize}"
- deprecation="${compile.deprecation}">
+ deprecation="${compile.deprecation}"
+ source="1.4"
+ target="1.4">
<classpath refid="compile.classpath"/>
</javac>
diff -Naur ../jakarta-struts-1.2.4-src.orig/build-webapp.xml ./build-webapp.xml
--- ../jakarta-struts-1.2.4-src.orig/build-webapp.xml 2004-09-13 02:35:58.000000000 +0200
+++ ./build-webapp.xml 2006-09-28 18:07:24.000000000 +0200
@@ -293,7 +293,9 @@
destdir="${webapp.target}/WEB-INF/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
+ source="1.4"
+ target="1.4">
<classpath refid="classpath"/>
</javac>
<copy todir="${webapp.target}/WEB-INF/classes">
diff -Naur ../jakarta-struts-1.2.4-src.orig/build.xml ./build.xml
--- ../jakarta-struts-1.2.4-src.orig/build.xml 2004-09-13 02:36:07.000000000 +0200
+++ ./build.xml 2006-09-28 18:07:43.000000000 +0200
@@ -305,7 +305,9 @@
destdir="${build.home}/library/classes"
debug="${compile.debug}"
optimize="${compile.optimize}"
- deprecation="${compile.deprecation}">
+ deprecation="${compile.deprecation}"
+ source="1.4"
+ target="1.4">
<classpath refid="compile.classpath"/>
</javac>
<copy todir="${build.home}/library/classes">
diff -Naur ../jakarta-struts-1.2.4-src.orig/contrib/artimus/WEB-INF/build.xml ./contrib/artimus/WEB-INF/build.xml
--- ../jakarta-struts-1.2.4-src.orig/contrib/artimus/WEB-INF/build.xml 2004-09-13 02:36:07.000000000 +0200
+++ ./contrib/artimus/WEB-INF/build.xml 2006-09-28 18:28:45.000000000 +0200
@@ -35,7 +35,7 @@
<target name="compile" depends="prepare,conf">
<!-- Remove jikes if you must use javac instead -->
<property name="build.compiler" value="jikes"/>
- <javac srcdir="src" destdir="classes">
+ <javac srcdir="src" destdir="classes" source="1.4" target="1.4">
<classpath refid="project.class.path"/>
</javac>
</target>
diff -Naur ../jakarta-struts-1.2.4-src.orig/contrib/scaffold/build.xml ./contrib/scaffold/build.xml
--- ../jakarta-struts-1.2.4-src.orig/contrib/scaffold/build.xml 2004-09-13 02:36:21.000000000 +0200
+++ ./contrib/scaffold/build.xml 2006-09-28 18:08:40.000000000 +0200
@@ -74,7 +74,7 @@
todir="classes"/>
<!-- Remove "jikes" value if you must use javac instead -->
<!-- property name="build.compiler" value="jikes"/ -->
- <javac srcdir="src" destdir="classes">
+ <javac srcdir="src" destdir="classes" source="1.4" target="1.4">
<classpath refid="${compile.classpath}"/>
</javac>
</target>
diff -Naur ../jakarta-struts-1.2.4-src.orig/contrib/struts-chain/build.xml ./contrib/struts-chain/build.xml
--- ../jakarta-struts-1.2.4-src.orig/contrib/struts-chain/build.xml 2004-09-13 02:35:56.000000000 +0200
+++ ./contrib/struts-chain/build.xml 2006-09-28 18:13:16.000000000 +0200
@@ -139,7 +139,9 @@
destdir="${build.home}/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
+ source="1.4"
+ target="1.4">
<classpath refid="classpath" />
</javac>
diff -Naur ../jakarta-struts-1.2.4-src.orig/contrib/struts-el/build-tests.xml ./contrib/struts-el/build-tests.xml
--- ../jakarta-struts-1.2.4-src.orig/contrib/struts-el/build-tests.xml 2004-09-13 02:36:15.000000000 +0200
+++ ./contrib/struts-el/build-tests.xml 2006-09-28 18:19:25.000000000 +0200
@@ -161,7 +161,9 @@
destdir="${out.test.dir}/classes"
debug="${compile.debug}"
optimize="${compile.optimize}"
- deprecation="${compile.deprecation}">
+ deprecation="${compile.deprecation}"
+ source="1.4"
+ target="1.4">
<classpath refid="compile.classpath"/>
</javac>
diff -Naur ../jakarta-struts-1.2.4-src.orig/contrib/struts-el/build-webapp.xml ./contrib/struts-el/build-webapp.xml
--- ../jakarta-struts-1.2.4-src.orig/contrib/struts-el/build-webapp.xml 2004-09-13 02:35:56.000000000 +0200
+++ ./contrib/struts-el/build-webapp.xml 2006-09-28 18:18:56.000000000 +0200
@@ -309,7 +309,9 @@
destdir="${webapp.target}/WEB-INF/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
+ source="1.4"
+ target="1.4">
<classpath refid="classpath"/>
</javac>
<copy todir="${webapp.target}/WEB-INF/classes">
diff -Naur ../jakarta-struts-1.2.4-src.orig/contrib/struts-el/build.xml ./contrib/struts-el/build.xml
--- ../jakarta-struts-1.2.4-src.orig/contrib/struts-el/build.xml 2004-09-13 02:35:55.000000000 +0200
+++ ./contrib/struts-el/build.xml 2006-09-28 18:20:41.000000000 +0200
@@ -231,7 +231,8 @@
description="Compile Struts-EL library files">
participants (1)
-
root@suse.de