rpms/jonas/devel .cvsignore,1.18,1.19 jonas.spec,1.97,1.98

[fedora-cvs-commits at redhat.com]

Author: gbenson

Update of /cvs/dist/rpms/jonas/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19688

Modified Files:
	.cvsignore jonas.spec 
Log Message:
aot-compile


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jonas/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	27 Jul 2005 14:19:00 -0000	1.18
+++ .cvsignore	29 Jul 2005 13:08:04 -0000	1.19
@@ -3,5 +3,5 @@
 jonas-doc-en-4.3.3.war
 ews-1.0-aph.jar
 jonas-4.3.3
-noarch
+i386
 *.src.rpm


Index: jonas.spec
===================================================================
RCS file: /cvs/dist/rpms/jonas/devel/jonas.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- jonas.spec	28 Jul 2005 18:28:10 -0000	1.97
+++ jonas.spec	29 Jul 2005 13:08:04 -0000	1.98
@@ -10,7 +10,7 @@
 %if %{?_with_snapshot:1}%{!?_with_snapshot:0}
 %define release		0.%{cvs_version}.1jpp_1rh
 %else
-%define release		1jpp_7fc
+%define release		1jpp_8fc
 %endif
 
 %define section		free
@@ -47,7 +47,6 @@
 License:        LGPL
 Group:          Internet/WWW/Servers
 URL:            http://jonas.objectweb.org/
-BuildArch:      noarch
 
 # Source files
 
@@ -262,6 +261,9 @@
 # For libgcj only
 BuildRequires:	jonathan-rmi
 
+# aot-compiled native libraries
+BuildRequires:	java-gcj-compat-devel >= 1.0.33
+
 # --------------------------------------------------------------------
 # End Build dependencies
 #
@@ -401,6 +403,10 @@
 # For libgcj only
 Requires: 	jonathan-rmi >= 3.1-2
 
+# aot-compiled native libraries
+Requires(post):   java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
+
 # --------------------------------------------------------------------
 # End Execution dependencies
 #
@@ -1119,6 +1125,8 @@
 # Expand manual war and remove it
 (cd doc; jar xf jonas-doc-en.war; rm jonas-doc-en.war; rm -fr WEB-INF; rm -fr META-INF; rm -fr CVS; rm README)
 
+aot-compile-rpm
+
 # -----------------------------------------------------------------------------
 
 
@@ -1219,27 +1227,24 @@
 rm -fr %{libdir}/common/ws
 rm -fr %{libdir}/common/xml
 
+%{_bindir}/rebuild-gcj-db
 
-%if %{with_tests}
-%post -n jonas-tests
-  # create the resources for jdbcra testsuite
-  su - jonas -s /bin/sh -c "cd %{rarsdir}/autoload/; . %{jonasrootdir}/bin/unix/RAConfig -j jdbc_xa1 -dm -p %{confdir}/PostgreSQL1 %{rarsdir}/autoload/JOnAS_jdbcDM PostgreSQL1_DM; . %{jonasrootdir}/bin/unix/RAConfig -j jdbc_xa2 -dm -p %{confdir}/PostgreSQL1 %{rarsdir}/autoload/JOnAS_jdbcDM PostgreSQL2_DM"
+%postun
+%{_bindir}/rebuild-gcj-db
 
-%endif
 
+%post examples
+%{_bindir}/rebuild-gcj-db
+
+%postun examples
+%{_bindir}/rebuild-gcj-db
 
-# ----------------------------------------
-# Finish the installation of JOnAS
-# ----------------------------------------
-%postun
-# We don't remove the pre-defined system users or groups
-#if [ "$1" = 0 ]; then
-#  # on erase
-#  userdel jonas > /dev/null 2>&1 || :
-#  groupdel jonas > /dev/null 2>&1 || :
-#fi
 
 %if %{with_tests}
+%post -n jonas-tests
+  # create the resources for jdbcra testsuite
+  su - jonas -s /bin/sh -c "cd %{rarsdir}/autoload/; . %{jonasrootdir}/bin/unix/RAConfig -j jdbc_xa1 -dm -p %{confdir}/PostgreSQL1 %{rarsdir}/autoload/JOnAS_jdbcDM PostgreSQL1_DM; . %{jonasrootdir}/bin/unix/RAConfig -j jdbc_xa2 -dm -p %{confdir}/PostgreSQL1 %{rarsdir}/autoload/JOnAS_jdbcDM PostgreSQL2_DM"
+
 %postun -n jonas-tests
 rm -f %{rarsdir}/autoload/PostgreSQL1_DM.rar
 rm -f %{rarsdir}/autoload/PostgreSQL2_DM.rar
@@ -1490,6 +1495,14 @@
 %attr(755,root,root) %{_bindir}/WsGen
 %attr(755,root,root) %{_bindir}/ClientStubGen
 
+%dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ow_%{name}*.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/mejb.jar.*
+# The rest is stuff we shouldn't be bundling but nevertheless are
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ews*.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ishmael.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xbean*.jar.*
+
 %files client
 %defattr(0644,jonas,jonas,0755)
 %dir %{jonasrootdir}/lib
@@ -1580,6 +1593,19 @@
 %{ejbjarsdir}/newsamplemdb.jar
 %{ejbjarsdir}/sb.jar
 
+%attr(-,root,root) %{_libdir}/gcj/%{name}/clusterDemo.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/eb.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jaasop*.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jms.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/lb.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/mailsb.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/newsamplemdb.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/olstoreejb.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/sampleappli.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/sb.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ws.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/wsclient.jar.*
+
 %if %{with_tests}
 %files tests
 %defattr(0644,jonas,jonas,0755)
@@ -1664,6 +1690,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Fri Jul 29 2005 Gary Benson <gbenson at redhat.com> - 4.3.3-1jpp_8fc
+- BC-compile.
+
 * Thu Jul 28 2005 Gary Benson <gbenson at redhat.com> - 4.3.3-1jpp_7fc
 - Remove even more jarfiles from the tarball.
 - Bundle a binary ews rebuilt with our axis (sorry).