rpms/jonathan-jeremie/devel jonathan-jeremie.spec,1.8,1.9

[fedora-cvs-commits redhat com]

Author: gbenson

Update of /cvs/dist/rpms/jonathan-jeremie/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv666

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


Index: jonathan-jeremie.spec
===================================================================
RCS file: /cvs/dist/rpms/jonathan-jeremie/devel/jonathan-jeremie.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jonathan-jeremie.spec	28 Jun 2005 12:48:10 -0000	1.8
+++ jonathan-jeremie.spec	1 Aug 2005 12:52:37 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:		jonathan-jeremie
 Version:	4.2
-Release:	1jpp_3fc
+Release:	1jpp_4fc
 Epoch:		0
 Summary:	Distributed Object Platform (DOP) written entirely in Java
 License:	LGPL
@@ -19,14 +19,12 @@
 BuildRequires:	objectweb-anttask
 BuildRequires:	monolog
 BuildRequires:	jonathan-core
-BuildRequires:	jacorb
-BuildRequires:	jonathan-rmi
+BuildRequires:	jonathan-rmi >= 0:3.1-5
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-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
 Jonathan is a Distributed Object Platform (DOP) written entirely in
@@ -70,7 +68,7 @@
 find . -name "*.jar" -exec rm -f {} \;
 
 %build
-export CLASSPATH=$(build-classpath jacorb/jacorb jonathan-rmi)
+export CLASSPATH=
 
 pushd config
     ln -sf $(build-classpath objectweb-anttask) ow_util_ant_tasks.jar
@@ -85,16 +83,6 @@
 
 ant jar jdoc
 
-gcj-dbtool -n output/dist/lib/%{name}-%{version}.db 512
-aot-compile \
-    output/dist/lib/jeremie.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/jeremie.jar \
-    %{_libdir}/lib%{name}-%{version}.jar.so
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -106,29 +94,22 @@
 (cd $RPM_BUILD_ROOT%{_javadir}/ && for jar in *-%{version}*; do \
 ln -sf ${jar} ${jar/-%{version}/}; 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/doc/javadoc/user/* \
                   $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 (cd $RPM_BUILD_ROOT%{_javadocdir} && ln -sf %{name}-%{version} %{name})
 
+aot-compile-rpm
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
 
 %postun
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
 
 %post javadoc
 rm -f %{_javadocdir}/%{name}
@@ -142,8 +123,7 @@
 %files
 %defattr(0644,root,root,0755)
 %{_javadir}/*
-%attr(0755,root,root) %{_libdir}/lib*.jar.so
-%{_libdir}/*/*/%{name}-%{version}.db
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 
 %files javadoc
 %defattr(0644,root,root,0755)
@@ -152,6 +132,11 @@
 %ghost %dir %{_javadocdir}/%{name}
 
 %changelog
+* Mon Aug  1 2005 Gary Benson <gbenson redhat com> 0:4.2-1jpp_4fc
+- 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 redhat com> 0:4.2-1jpp_3fc
 - BC-compile.