rpms/carol/devel carol.spec,1.11,1.12

[fedora-cvs-commits redhat com]

Author: gbenson

Update of /cvs/dist/rpms/carol/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14591

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


Index: carol.spec
===================================================================
RCS file: /cvs/dist/rpms/carol/devel/carol.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- carol.spec	28 Jun 2005 15:44:51 -0000	1.11
+++ carol.spec	1 Aug 2005 13:12:29 -0000	1.12
@@ -1,6 +1,6 @@
 %define name		carol
 %define version		1.8.9.3
-%define release		1jpp_4fc
+%define release		1jpp_5fc
 %define	section		free
 
 
@@ -34,7 +34,7 @@
 BuildRequires:  velocity
 BuildRequires:  xerces-j2
 BuildRequires:  xml-commons-apis
-BuildRequires:	jonathan-rmi
+BuildRequires:	jonathan-rmi >= 0:3.1-5
 Requires:  jakarta-commons-cli
 Requires:  jacorb
 Requires:  jgroups
@@ -49,10 +49,9 @@
 Requires:  xml-commons-apis
 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
 CAROL is a library allowing to use different RMI implementations. 
@@ -99,22 +98,11 @@
 ln -sf $(build-classpath velocity) .
 ln -sf $(build-classpath xerces-j2) .
 ln -sf $(build-classpath xml-commons-apis) .
-ln -sf $(build-classpath jonathan-rmi) .
 popd
 
 export OPT_JAR_LIST="objectweb-anttask"
 ant dist jdoc
 
-gcj-dbtool -n output/dist/lib/%{name}-%{version}.db 512
-aot-compile \
-    output/dist/lib/ow_%{name}.jar \
-    output/dist/lib/libow_%{name}-%{version}.jar.so \
-    "$RPM_OPT_FLAGS -fPIC"
-gcj-dbtool -f \
-    output/dist/lib/%{name}-%{version}.db \
-    output/dist/lib/ow_%{name}.jar \
-    %{_libdir}/libow_%{name}-%{version}.jar.so
-
 %install
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
@@ -133,34 +121,26 @@
         $RPM_BUILD_ROOT%{_javadir}/%{name}/shell-%{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}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
+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}/%{name}
-%attr(0755,root,root) %{_libdir}/lib*.jar.so
-%{_libdir}/*/*/%{name}-%{version}.db
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 
 %files javadoc
 %defattr(-,root,root)
@@ -168,6 +148,11 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Mon Aug  1 2005 Gary Benson <gbenson at redhat.com> 0:1.8.9.3-1jpp_5fc
+- Remove explicit references to jacorb and jonathan-rmi.
+- Switch to aot-compile-rpm.
+- Build on ia64, ppc64, s390 and s390x.
+
 * Mon Jun 27 2005 Gary Benson <gbenson at redhat.com> 0:1.8.9.3-1jpp_4fc
 - 'And do it again until you get it right!'