rpms/struts/devel struts.spec,1.16,1.17

[fedora-cvs-commits at redhat.com]

Author: gbenson

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

Modified Files:
	struts.spec 
Log Message:
Build on ia64, ppc64, s390 and s390x


Index: struts.spec
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- struts.spec	27 Jun 2005 13:13:02 -0000	1.16
+++ struts.spec	20 Jul 2005 11:27:46 -0000	1.17
@@ -1,7 +1,7 @@
 %define name		struts
 %define full_name	jakarta-%{name}
 %define version		1.2.4
-%define release		2jpp_1fc
+%define release		2jpp_2fc
 %define tomcat5appsdir  %{_localstatedir}/lib/tomcat5/webapps
 %define tomcat5ctxdir   %{_sysconfdir}/tomcat5/Catalina/localhost
 %define section		free
@@ -51,10 +51,9 @@
 # RHEL4 and FC4
 Obsoletes:	struts11 <= 0:1.1-1jpp_7fc
 # libgcj aot-compiled native libraries
-BuildRequires:         gcc-java >= 4.0.0-0.43
-BuildRequires:         java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh
-Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh
-ExclusiveArch:         %{ix86} x86_64 ppc alpha
+BuildRequires:    java-gcj-compat-devel >= 1.0.35
+Requires(post):   java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
 
 %description
 Welcome to the Struts Framework! The goal of this project is to provide
@@ -95,6 +94,8 @@
 Group:          Development/Java
 Requires:       %{name} = %{version}-%{release}
 Prereq:         tomcat5
+Requires(post): java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
 
 %description webapps-tomcat5
 Sample %{name} webapps for tomcat5.
@@ -127,16 +128,6 @@
 	-Djakarta-oro.jar=$(build-classpath oro) \
 	 compile.library compile.webapps compile.javadoc
 
-gcj-dbtool -n target/library/%{name}-%{version}.db 1024
-aot-compile \
-    target/library/%{name}.jar \
-    target/library/lib%{name}-%{version}.jar.so \
-    "$RPM_OPT_FLAGS -fPIC"
-gcj-dbtool -f \
-    target/library/%{name}-%{version}.db \
-    target/library/%{name}.jar \
-    %{_libdir}/lib%{name}-%{version}.jar.so
-
 %install
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
@@ -150,13 +141,6 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
 install -m 644 target/library/*.tld $RPM_BUILD_ROOT%{_datadir}/%{name}
 install -m 644 target/library/*.dtd $RPM_BUILD_ROOT%{_datadir}/%{name}
-# solibs
-install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
-install -m 755 target/library/lib*.jar.so $RPM_BUILD_ROOT%{_libdir}
-# gcjdb
-gcjdbdir=`gcj-dbtool -p %{_libdir}`.d
-install -d -m 755 $RPM_BUILD_ROOT$gcjdbdir
-install -m 644 target/library/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
 
 # tomcat 5 webapps
 install -d -m 755 $RPM_BUILD_ROOT%{tomcat5appsdir}
@@ -173,11 +157,19 @@
     && for tld in ../../../../../..%{_datadir}/%{name}/*.tld; do ln -sf $tld `basename $tld`; done)
 done
 
+aot-compile-rpm
+
 %post
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
 
 %postun
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
+
+%post webapps-tomcat5
+%{_bindir}/rebuild-gcj-db
+
+%postun webapps-tomcat5
+%{_bindir}/rebuild-gcj-db
 
 
 %clean
@@ -188,8 +180,8 @@
 %doc INSTALL LICENSE.txt README NOTICE.txt STATUS.txt
 %{_javadir}/*
 %{_datadir}/%{name}
-%attr(0755,root,root) %{_libdir}/*.so
-%{_libdir}/*/*/*.db
+%dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
 
 %files manual
 %defattr(-,root,root)
@@ -216,8 +208,13 @@
 %dir %{tomcat5appsdir}/%{name}-tiles-documentation
 %{tomcat5appsdir}/%{name}-tiles-documentation/*
 %{tomcat5ctxdir}/%{name}-*.xml
+%attr(-,root,root) %{_libdir}/gcj/%{name}/*classes.jar.*
 
 %changelog
+* 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).
+
 * Wed Jun 15 2005 Gary Benson <gbenson at redhat.com> - 0:1.2.4-2jpp_1fc
 - Make workaround for #157205 specific to libgcj.