rpms/tomcat5/devel tomcat5.spec,1.30,1.31

[fedora-cvs-commits at redhat.com]

Author: gbenson

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

Modified Files:
	tomcat5.spec 
Log Message:
Finish converting to aot-compile-rpm


Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- tomcat5.spec	20 Jul 2005 14:52:56 -0000	1.30
+++ tomcat5.spec	20 Jul 2005 19:17:19 -0000	1.31
@@ -532,6 +532,18 @@
 ln -s %{name}-jasper-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-jasper
 popd
 
+# Compile these jarfiles with -O0 to avoid PR middle-end/21362.
+# aot-compile-rpm will build mapping databases for them.
+gcjflags="`echo $RPM_OPT_FLAGS | sed 's:-O.:-O0:'` -fPIC -findirect-dispatch"
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
+for jar in catalina catalina-optional; do
+    gcj -shared $gcjflags -Wl,-Bsymbolic \
+        $RPM_BUILD_ROOT%{serverdir}/lib/$jar.jar \
+	-o $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}/$jar.jar.so
+done
+
+aot-compile-rpm
+
 
 
 %clean
@@ -752,19 +764,19 @@
 %{serverdir}/lib/*
 # %{tempdir}/README.txt
 
-#%attr(0755,root,root) %{_libdir}/libnaming*.jar.so
-#%attr(0755,root,root) %{_libdir}/libcatalina*.jar.so
-#%attr(0755,root,root) %{_libdir}/libtomcat*.jar.so
-#%attr(0755,root,root) %{_libdir}/libservlets*.jar.so
-#%{_libdir}/*/*/%{name}-%{version}.db
+%attr(-,root,root) %{_libdir}/gcj/%{name}/bootstrap.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina*.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/naming*.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/servlets-*.*jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-*.jar.*
 
 %files servlet-2.4-api
 %defattr(-,root,root)
 %doc %{packdname}/jakarta-tomcat-5/LICENSE
 %{_javadir}/servletapi5*.jar
 %{_javadir}/jspapi*.jar
-#%attr(0755,root,root) %{_libdir}/lib*api*.jar.so
-#%{_libdir}/*/*/%{name}-servlet-2.4-api-%{version}.db
+%dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/*api*.jar.*
 
 %files servlet-2.4-api-javadoc
 %defattr(-,root,root)
@@ -780,8 +792,7 @@
 %doc %{packdname}/jakarta-tomcat-jasper/jasper2/doc/*
 %{_javadir}/jasper*.jar
 %{_bindir}/j*
-#%attr(0755,root,root) %{_libdir}/libjasper*.jar.so
-#%{_libdir}/*/*/%{name}-jasper-%{version}.db
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jasper*.jar.*
 
 %files jasper-javadoc
 %defattr(-,root,root)
@@ -814,9 +825,8 @@
 
 %changelog
 * Wed Jul 20 2005 Gary Benson <gbenson at redhat.com>
-- Build on ia64, ppc64, s390 and s390x.
-- Switch to aot-compile-rpm.
 - Remove jarfiles from the tarball.
+- Switch to aot-compile-rpm.
 
 * Wed Jul 20 2005 Gary Benson <gbenson at redhat.com> 0:5.0.30-7jpp
 - Remove references to the never used commons-daemon.