rpms/tomcat5/devel tomcat5.spec,1.84,1.85

[fedora-cvs-commits at redhat.com]

Author: fnasser

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

Modified Files:
	tomcat5.spec 
Log Message:
Disable JSP pre-compilation on ppc64 and x390x (FIXME)




Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- tomcat5.spec	12 Jul 2006 08:31:05 -0000	1.84
+++ tomcat5.spec	13 Jul 2006 19:06:38 -0000	1.85
@@ -69,7 +69,7 @@
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 Name: tomcat5
 Version: 5.5.17
-Release: 3jpp_3fc
+Release: 3jpp_2fc
 Epoch: 0
 License: Apache Software License
 #Vendor: JPackage Project
@@ -99,6 +99,8 @@
 Patch15: %{name}-%{majversion}-skip-native.patch
 Patch16: %{name}-%{majversion}-jspc-classpath.patch
 Patch17: %{name}-%{majversion}-gcj-class-init-workaround.patch
+#FIXME Disable JSP pre-compilation on ppc64 and x390x
+Patch18: %{name}-%{majversion}-skip-jsp-precompile.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root
 
@@ -413,6 +415,9 @@
 #%patch15 -b .p15
 %patch16 -b .p16
 #%patch17 -b .p17
+%ifarch ppc64 s390x
+%patch18 -b .p18
+%endif
 
 %if %{without_ecj}
 rm %{jname}/src/share/org/apache/jasper/compiler/JDTCompiler.java
@@ -1202,11 +1207,9 @@
 %ghost %doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:5.5.17-3jpp_3fc
-- rebuild
-
-* Fri Jul 07 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_2fc
+* Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_2fc
 - Re-enable ppc64 and s390x
+- Disable JSP pre-compilation on ppc64 and x390x (FIXME)
 
 * Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_1fc
 - Full build