rpms/struts/devel struts.spec, 1.21, 1.22 struts-1.2.4.bz163689.patch, 1.5, NONE

[fedora-cvs-commits at redhat.com]

Author: gbenson

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

Modified Files:
	struts.spec 
Removed Files:
	struts-1.2.4.bz163689.patch 
Log Message:
Remove workarounds for #163689


Index: struts.spec
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- struts.spec	20 Jul 2005 14:08:38 -0000	1.21
+++ struts.spec	22 Jul 2005 08:18:02 -0000	1.22
@@ -1,7 +1,7 @@
 %define name		struts
 %define full_name	jakarta-%{name}
 %define version		1.2.4
-%define release		2jpp_2fc
+%define release		2jpp_3fc
 %define tomcat5appsdir  %{_localstatedir}/lib/tomcat5/webapps
 %define tomcat5ctxdir   %{_sysconfdir}/tomcat5/Catalina/localhost
 %define section		free
@@ -21,7 +21,6 @@
 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
@@ -108,9 +107,6 @@
 %patch0
 %patch1 -p1
 %patch2 -p1
-%ifarch ppc64 s390x
-%patch3 -p1
-%endif
 # remove all binary libs
 find . -name "*.class" -exec rm -f {} \;
 find . -name "*.jar" -exec rm -f {} \;
@@ -143,9 +139,7 @@
 rm -rf target/documentation/api
 # data
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
-%ifnarch ppc64 s390x
 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
@@ -159,10 +153,8 @@
         (cd $RPM_BUILD_ROOT%{tomcat5appsdir}/%{name}-$webapp/WEB-INF/lib \
         && ln -sf ../../../../../../..%{_javadir}/$jar.jar .)
     done
-%ifnarch ppc64 s390x
     (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
@@ -193,14 +185,10 @@
 
 %files manual
 %defattr(-,root,root)
-%ifnarch ppc64 s390x
 %doc target/documentation/*.html
-%endif
 %doc target/documentation/*.gif
 %doc target/documentation/uml
-%ifnarch ppc64 s390x
 %doc target/documentation/userGuide
-%endif
 %doc target/documentation/images
 
 %files javadoc
@@ -223,6 +211,9 @@
 %attr(-,root,root) %{_libdir}/gcj/%{name}/*classes.jar.*
 
 %changelog
+* Fri Jul 22 2005 Gary Benson <gbenson at redhat.com> - 0:1.2.4-2jpp_3fc
+- Remove workarounds for #163689.
+
 * Wed Jul 20 2005 Gary Benson <gbenson at redhat.com> - 0:1.2.4-2jpp_2fc
 - Build on ia64, ppc64, s390 and s390x.
 - Switch to aot-compile-rpm (also BC-compiles webapps).


--- struts-1.2.4.bz163689.patch DELETED ---