rpms/struts/devel struts-1.2.4.bz163689.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: gbenson

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

Modified Files:
	struts-1.2.4.bz163689.patch 
Log Message:
More workarounds

struts-1.2.4.bz163689.patch:
 build-webapps.xml |    8 ++++++++
 build.xml         |    2 ++
 2 files changed, 10 insertions(+)

Index: struts-1.2.4.bz163689.patch
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts-1.2.4.bz163689.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- struts-1.2.4.bz163689.patch	20 Jul 2005 11:54:33 -0000	1.1
+++ struts-1.2.4.bz163689.patch	20 Jul 2005 12:34:18 -0000	1.2
@@ -14,3 +14,51 @@
          <copy todir="${build.home}/library/classes/META-INF/tlds">
              <fileset dir="${build.home}/library" includes="struts-*.tld"/>
          </copy>
+--- jakarta-struts-1.2.4-src/build-webapps.xml~	2004-09-13 01:36:11.000000000 +0100
++++ jakarta-struts-1.2.4-src/build-webapps.xml	2005-07-20 13:33:22.000000000 +0100
+@@ -207,6 +207,7 @@
+ <target name="compile.docs" 
+         description="Perform XSLT transformations">
+     <!-- Create the taglib documentation -->
++<!--
+     <style   basedir="${doc.dir}" destdir="${build.home}/documentation"
+            extension=".html" style="${doc.dir}/stylesheets/struts.xsl"
+             includes="*.xml"
+@@ -214,7 +215,9 @@
+             reloadstylesheet="true">
+       <param name="relative-path" expression="."/>
+     </style>            
++-->
+     <!-- Create the FAQs -->
++<!--
+     <style   basedir="${doc.dir}/faqs"
+              destdir="${build.home}/documentation/faqs"
+            extension=".html" style="${doc.dir}/stylesheets/struts.xsl"
+@@ -223,7 +226,9 @@
+             reloadstylesheet="true">
+       <param name="project-path" expression="../faqs/project.xml"/>
+     </style>            
++-->
+     <!-- Create the proposals -->
++<!--
+     <style   basedir="${doc.dir}/proposals"
+              destdir="${build.home}/documentation/proposals"
+            extension=".html" style="${doc.dir}/stylesheets/struts.xsl"
+@@ -232,7 +237,9 @@
+             reloadstylesheet="true">
+       <param name="project-path" expression="../proposals/project.xml"/>
+     </style>            
++-->
+     <!-- Create the user guide -->
++<!--
+     <style   basedir="${doc.dir}/userGuide"
+              destdir="${build.home}/documentation/userGuide"
+            extension=".html" style="${doc.dir}/stylesheets/struts.xsl"
+@@ -241,6 +248,7 @@
+             reloadstylesheet="true">
+       <param name="project-path" expression="../userGuide/project.xml"/>
+     </style>  
++-->
+ 
+     <!-- Copy the basic documentation files -->
+     <copy      todir="${build.home}/documentation">