rpms/struts/devel struts-1.2.8.build.patch, 1.3, 1.4 struts.spec, 1.37, 1.38

[fedora-cvs-commits at redhat.com]

Author: dbhole

Update of /cvs/dist/rpms/struts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8188

Modified Files:
	struts-1.2.8.build.patch struts.spec 
Log Message:

Remove xalan-j2-serializer from classpath.



struts-1.2.8.build.patch:
 build-webapp.xml |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

Index: struts-1.2.8.build.patch
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts-1.2.8.build.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- struts-1.2.8.build.patch	24 Jul 2006 18:43:37 -0000	1.3
+++ struts-1.2.8.build.patch	26 Jul 2006 19:28:00 -0000	1.4
@@ -1,5 +1,5 @@
 --- ./build-webapp.xml.sav	2005-11-08 03:55:28.000000000 -0500
-+++ ./build-webapp.xml	2006-07-24 14:41:30.000000000 -0400
++++ ./build-webapp.xml	2006-07-26 15:25:26.000000000 -0400
 @@ -219,6 +219,7 @@
    <mkdir   dir="${webapp.target}" />
    <mkdir   dir="${webapp.target}/WEB-INF" />
@@ -28,23 +28,3 @@
  </target>
  
  
---- ./build-webapps.xml.sav	2005-11-08 03:56:16.000000000 -0500
-+++ ./build-webapps.xml	2006-07-24 14:42:07.000000000 -0400
-@@ -189,7 +189,7 @@
-     </copy>
- 
-     <!-- Validate tiles docs -->
--    <xmlvalidate warn="yes" failonerror="yes" lenient="no">
-+    <xmlvalidate warn="yes" failonerror="no" lenient="no">
-        <fileset dir="${build.home}/tiles-documentation" includes="**/*.html"/>
- 
-       <!-- Reference local DTDS to avoid network lookup -->
-@@ -290,7 +290,7 @@
-         documentation against the DTDs
- -->
- <target name="validate.docs" description="Validate generated XHTML documents">
--    <xmlvalidate warn="yes" failonerror="yes" lenient="no">
-+    <xmlvalidate warn="yes" failonerror="no" lenient="no">
-        <fileset dir="${build.home}/documentation">
-         <include name="**/*.html"/>
-         <exclude name="download.html"/>


Index: struts.spec
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- struts.spec	24 Jul 2006 18:24:44 -0000	1.37
+++ struts.spec	26 Jul 2006 19:28:00 -0000	1.38
@@ -7,7 +7,7 @@
 
 Name:		struts
 Version:	1.2.8
-Release: 	2jpp_15fc
+Release: 	2jpp_16fc
 Epoch:		0
 Summary:	Web application framework
 License:	Apache License
@@ -115,9 +115,7 @@
 %build
 
 # build struts
-# The new xalan needs xalan-j2-serializer
-export CLASSPATH=`build-classpath xalan-j2-serializer`
-ant -d -Djdbc20ext.jar=$(find-jar jdbc-stdext) \
+ant -Djdbc20ext.jar=$(find-jar jdbc-stdext) \
 	-Dcommons-beanutils.jar=$(build-classpath commons-beanutils) \
 	-Dcommons-digester.jar=$(build-classpath commons-digester) \
 	-Dcommons-fileupload.jar=$(build-classpath commons-fileupload) \
@@ -211,6 +209,9 @@
 %attr(-,root,root) %{_libdir}/gcj/%{name}/*classes.jar.*
 
 %changelog
+* Wed Jul 26 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.2.8-2jpp_16fc
+- Remove xalan-j2-serializer from classpath.
+
 * Mon Jul 24 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.2.8-2jpp_15fc
 - Fixed classpath issue.
 - Removed spurious macros.