rpms/jonathan-rmi/devel jonathan-rmi.spec,1.7,1.8

[fedora-cvs-commits at redhat.com]

Author: gbenson

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

Modified Files:
	jonathan-rmi.spec 
Log Message:
Build on ia64, ppc64, s390 and s390x


Index: jonathan-rmi.spec
===================================================================
RCS file: /cvs/dist/rpms/jonathan-rmi/devel/jonathan-rmi.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jonathan-rmi.spec	27 Jun 2005 13:08:59 -0000	1.7
+++ jonathan-rmi.spec	19 Jul 2005 09:37:24 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		jonathan-rmi
 Version:	3.1
-Release:	3
+Release:	4
 Summary:	Subset of javax.rmi
 License:	LGPL
 Group:          Development/Libraries/Java
@@ -13,13 +13,13 @@
 Patch3:		%{name}-api.patch
 Patch4:		%{name}-classloader.patch
 BuildRequires:	java-devel
-BuildRequires:	jacorb
+BuildRequires:	jacorb >= 2.2-3jpp_3fc
+Requires:	jacorb >= 2.2-3jpp_3fc
 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
 A subset of javax.rmi that libgcj is otherwise missing.
@@ -34,47 +34,42 @@
 cp -a %{SOURCE1} src/org/omg/SendingContext
 
 %build
-javac -cp $(build-classpath jacorb/jacorb):src -d build src
+javac -d build src
 (cd build && jar cf %{name}-%{version}.jar *)
 
-gcj-dbtool -n build/%{name}-%{version}.db 64
-aot-compile \
-    build/%{name}-%{version}.jar \
-    build/lib%{name}-%{version}.jar.so \
-    "$RPM_OPT_FLAGS -fPIC"
-gcj-dbtool -f \
-    build/%{name}-%{version}.db \
-    build/%{name}-%{version}.jar \
-    %{_libdir}/lib%{name}-%{version}.jar.so
-
 %install
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -m 644 build/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
 ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
-install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
-install -m 755 build/lib*.jar.so $RPM_BUILD_ROOT%{_libdir}
+mkdir -p $RPM_BUILD_ROOT%{_jvmdir}/java-1.4.2-gcj-1.4.2.0/jre/lib
+ln -s %{_javadir}/%{name}/%{name}-%{version}.jar \
+    $RPM_BUILD_ROOT%{_jvmdir}/java-1.4.2-gcj-1.4.2.0/jre/lib/%{name}.jar
 
-gcjdbdir=`gcj-dbtool -p %{_libdir}`.d
-install -d -m 755 $RPM_BUILD_ROOT$gcjdbdir
-install -m 644 build/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
+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
 
 %files
 %defattr(-,root,root)
 %{_javadir}/*.jar
-%attr(0755,root,root) %{_libdir}/*.so
-%{_libdir}/*/*/*.db
+%{_jvmdir}/java-1.4.2-gcj-1.4.2.0/jre/lib/%{name}.jar
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 
 %changelog
+* Tue Jul 19 2005 Gary Benson <gbenson at redhat.com> 3.1-4
+- Build on ia64, ppc64, s390 and s390x.
+- Switch to aot-compile-rpm.
+- Add symbolic link in libgcj's extension directory.
+- Require a jacorb with a similar extension link.
+
 * Mon Jun 27 2005 Gary Benson <gbenson at redhat.com> 3.1-3
 - BC-compile.