rpms/jotm/devel jotm.spec,1.7,1.8

[fedora-cvs-commits at redhat.com]

Author: gbenson

Update of /cvs/dist/rpms/jotm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13303

Modified Files:
	jotm.spec 
Log Message:
Switch to aot-compile-rpm and build on ia64, ppc64, s390 and s390x


Index: jotm.spec
===================================================================
RCS file: /cvs/dist/rpms/jotm/devel/jotm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jotm.spec	28 Jun 2005 13:34:05 -0000	1.7
+++ jotm.spec	1 Aug 2005 14:00:44 -0000	1.8
@@ -1,6 +1,6 @@
 %define name		jotm
 %define version		2.0.5
-%define release		1jpp_2fc
+%define release		1jpp_3fc
 %define	section		free
 
 Name:		%{name}
@@ -26,14 +26,12 @@
 BuildRequires:	jta
 BuildRequires:	log4j
 BuildRequires:	oldkilim
-BuildRequires:	jacorb
-BuildRequires:	jonathan-rmi
+BuildRequires:	jonathan-rmi >= 0:3.1-5
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 # 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.31
+Requires(post):   java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
 
 %description
 Today the JOTM team delivers to you a Java Open Source 
@@ -86,21 +84,9 @@
 ln -sf $(build-classpath jta) jta-spec1_0_1.jar
 ln -sf $(build-classpath oldkilim) kilim.jar
 ln -sf $(build-classpath log4j) log4j.jar
-ln -sf $(build-classpath jacorb/jacorb) jacorb.jar
-ln -sf $(build-classpath jonathan-rmi) jonathan-rmi.jar
 popd
 ant
 
-gcj-dbtool -n output/dist/lib/%{name}-%{version}.db 128
-aot-compile \
-    output/dist/lib/%{name}.jar \
-    output/dist/lib/lib%{name}-%{version}.jar.so \
-    "$RPM_OPT_FLAGS -fPIC"
-gcj-dbtool -f \
-    output/dist/lib/%{name}-%{version}.db \
-    output/dist/lib/%{name}.jar \
-    %{_libdir}/lib%{name}-%{version}.jar.so
-
 %install
 
 # jars
@@ -113,15 +99,6 @@
 #        $RPM_BUILD_ROOT%{_javadir}/%{name}/jrmp-stubs-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
 
-# solibs
-install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
-install -m 755 output/dist/lib/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 output/dist/lib/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
-
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr output/dist/jdoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -138,11 +115,13 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 cp -pr output/dist/doc/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
+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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -152,8 +131,7 @@
 %doc output/dist/LICENSE.txt
 %{_javadir}/%{name}
 %{_datadir}/%{name}-%{version}/conf
-%attr(0755,root,root) %{_libdir}/lib*.jar.so
-%{_libdir}/*/*/%{name}-%{version}.db
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 
 %files javadoc
 %defattr(-,root,root)
@@ -169,6 +147,11 @@
 %{_docdir}/%{name}-%{version}
 
 %changelog
+* Mon Aug  1 2005 Gary Benson <gbenson at redhat.com> 0:2.0.5-1jpp_3fc
+- Remove explicit references to jacorb and jonathan-rmi.
+- Switch to aot-compile-rpm.
+- Build on ia64, ppc64, s390 and s390x.
+
 * Tue Jun 28 2005 Gary Benson <gbenson at redhat.com> 0:2.0.5-1jpp_2fc
 - BC-compile.