rpms/jacorb/devel jacorb.spec,1.9,1.10

[fedora-cvs-commits at redhat.com]

Author: gbenson

Update of /cvs/dist/rpms/jacorb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24456

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


Index: jacorb.spec
===================================================================
RCS file: /cvs/dist/rpms/jacorb/devel/jacorb.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jacorb.spec	27 Jun 2005 18:34:21 -0000	1.9
+++ jacorb.spec	18 Jul 2005 16:44:16 -0000	1.10
@@ -1,6 +1,6 @@
 %define name		jacorb
 %define version		2.2
-%define release		3jpp_2fc
+%define release		3jpp_3fc
 %define section		devel
 
 Summary:	Free Java implementation of OMG's CORBA standard
@@ -27,10 +27,9 @@
 Requires:	avalon-logkit
 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
 - high-performance, fully multithreaded ORB 
@@ -107,29 +106,6 @@
 )
 ant -Dbuild.sysclasspath=first all doc
 
-gcj-dbtool -n lib/%{name}-%{version}.db 8192
-# Can't use aot-compile or we hit #158308
-mkdir -p lib/tmp/1
-pushd lib/tmp
-(cd 1 && jar xf ../../%{name}.jar)
-mkdir -p {2,3}/org/{jacorb,omg}
-mv 1/org/omg/{CORBA,CosNotifyChannelAdmin} 2/org/omg
-mv 1/org/jacorb/notification 2/org/jacorb
-mv 1/org/omg/{CosCollection,CosTrading,Security} 3/org/omg
-mv 1/org/jacorb/orb 3/org/jacorb
-flags="$RPM_OPT_FLAGS -fPIC -findirect-dispatch"
-for i in 1 2 3; do
-    (cd $i && jar cfM ../$i.jar org)
-    gcj -c $flags $i.jar -o $i.o 
-done
-gcj -shared $flags -Wl,-Bsymbolic *.o -o ../lib%{name}-%{version}.jar.so
-popd
-# (end of #158308 workaround)
-gcj-dbtool -f \
-    lib/%{name}-%{version}.db \
-    lib/%{name}.jar \
-    %{_libdir}/lib%{name}-%{version}.jar.so
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -143,14 +119,10 @@
 install -p -m 0644 lib/idl.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/idl-%{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 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 lib/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
+# extension symlink for java-1.4.2-gcj-compat
+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
 
 # bin, etc, idl
 install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/bin
@@ -174,14 +146,16 @@
 # demo
 install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/demo
 
+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}
@@ -200,8 +174,8 @@
 %attr(0755,root,root) %{_datadir}/%{name}-%{version}/bin/*
 %{_datadir}/%{name}-%{version}/etc
 %{_datadir}/%{name}-%{version}/idl
-%attr(0755,root,root) %{_libdir}/lib*.jar.so
-%{_libdir}/*/*/%{name}-%{version}.db
+%{_jvmdir}/java-1.4.2-gcj-1.4.2.0/jre/lib/%{name}.jar
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 
 %files javadoc
 %defattr(0644,root,root,0755)
@@ -217,7 +191,12 @@
 %{_datadir}/%{name}-%{version}/demo
 
 %changelog
-* Mon Jun 27 2005 Gary Benson <gbenson at redhat.com> 0:2.2-3jpp_1fc
+* Mon Jul 18 2005 Gary Benson <gbenson at redhat.com> 0:2.2-3jpp_3fc
+- Build on ia64, ppc64, s390 and s390x.
+- Switch to aot-compile-rpm (also BC-compiles idl jarfile).
+- Add symbolic link in java-1.4.2-gcj-compat's extension directory.
+
+* Mon Jun 27 2005 Gary Benson <gbenson at redhat.com> 0:2.2-3jpp_2fc
 - BC-compile the main jarfile.
 
 * Wed Jun 15 2005 Gary Benson <gbenson at redhat.com> 0:2.2-3jpp_1fc