rpms/tomcat5/devel tomcat5.spec, 1.35, 1.36 tomcat5-5.0.30-bz163689.patch, 1.4, NONE

[fedora-cvs-commits at redhat.com]

Author: gbenson

Update of /cvs/dist/rpms/tomcat5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11647

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


Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- tomcat5.spec	21 Jul 2005 13:22:17 -0000	1.35
+++ tomcat5.spec	22 Jul 2005 08:53:24 -0000	1.36
@@ -2,7 +2,7 @@
 %define full_name	jakarta-%{name}
 %define version		5.0.30
 %define majversion	5.0
-%define release		8jpp_1fc
+%define release		8jpp_2fc
 %define section		free
 
 %define summary		Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
@@ -55,7 +55,6 @@
 Patch9:			%{name}-%{version}-catalina.sh.patch
 Patch10:		%{name}-%{version}-precompile.patch
 Patch11:		%{name}-%{version}-no-daemon.patch
-Patch12:		%{name}-%{version}-bz163689.patch
 BuildRoot:		%{_tmppath}/%{name}-root-%{version}
 
 Requires:		jpackage-utils >= 0:1.6.0
@@ -223,9 +222,6 @@
 %patch9 -p1
 %patch10 -p2 -b .orig
 %patch11 -p2 -b .orig
-%ifarch ppc64 s390x
-%patch12 -p2 -b .orig
-%endif
 
 %build
 
@@ -828,6 +824,9 @@
 %{serverdir}/webapps/*
 
 %changelog
+* Fri Jul 22 2005 Gary Benson <gbenson at redhat.com> 0:5.0.30-8jpp_2fc
+- Remove workarounds for #163689.
+
 * Thu Jul 21 2005 Gary Benson <gbenson at redhat.com> 0:5.0.30-8jpp_1fc
 - Build on ia64, ppc64, s390 and s390x.
 


--- tomcat5-5.0.30-bz163689.patch DELETED ---