[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/struts/devel struts-1.2.4.bz163689.patch, NONE, 1.1 struts.spec, 1.17, 1.18



Author: gbenson

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

Modified Files:
	struts.spec 
Added Files:
	struts-1.2.4.bz163689.patch 
Log Message:
Work around #163689

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

--- NEW FILE struts-1.2.4.bz163689.patch ---
--- jakarta-struts-1.2.4-src/build.xml~	2004-09-13 01:36:07.000000000 +0100
+++ jakarta-struts-1.2.4-src/build.xml	2005-07-20 12:42:00.000000000 +0100
@@ -316,11 +316,13 @@
             <fileset dir="${conf.share.dir}" includes="*.tld"/>
             <fileset dir="${conf.share.dir}" includes="*.xml"/>
         </copy>
+<!--
         <style basedir="${doc.dir}/userGuide"
             destdir="${build.home}/library"
             extension=".tld"
             style="${doc.dir}/stylesheets/tld.xsl"
             includes="struts-*.xml"/>
+-->
         <copy todir="${build.home}/library/classes/META-INF/tlds">
             <fileset dir="${build.home}/library" includes="struts-*.tld"/>
         </copy>


Index: struts.spec
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- struts.spec	20 Jul 2005 11:27:46 -0000	1.17
+++ struts.spec	20 Jul 2005 11:54:33 -0000	1.18
@@ -21,6 +21,7 @@
 Patch0:		%{name}-%{version}.build.patch
 Patch1:		%{name}-%{version}.servlet24.patch
 Patch2:		%{name}-%{version}.bz157205.patch
+Patch3:		%{name}-%{version}.bz163689.patch
 Url:		http://jakarta.apache.org/%{name}
 Requires:	servletapi5
 Requires:	jdbc-stdext
@@ -107,6 +108,9 @@
 %patch0
 %patch1 -p1
 %patch2 -p1
+%ifarch ppc64
+%patch3 -p1
+%endif
 # remove all binary libs
 find . -name "*.class" -exec rm -f {} \;
 find . -name "*.jar" -exec rm -f {} \;
@@ -139,7 +143,9 @@
 rm -rf target/documentation/api
 # data
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
+%ifarch ppc64
 install -m 644 target/library/*.tld $RPM_BUILD_ROOT%{_datadir}/%{name}
+%endif
 install -m 644 target/library/*.dtd $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 # tomcat 5 webapps
@@ -153,8 +159,10 @@
         (cd $RPM_BUILD_ROOT%{tomcat5appsdir}/%{name}-$webapp/WEB-INF/lib \
         && ln -sf ../../../../../../..%{_javadir}/$jar.jar .)
     done
+%ifarch ppc64
     (cd $RPM_BUILD_ROOT%{tomcat5appsdir}/%{name}-$webapp/WEB-INF \
     && for tld in ../../../../../..%{_datadir}/%{name}/*.tld; do ln -sf $tld `basename $tld`; done)
+%endif
 done
 
 aot-compile-rpm


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]