rpms/carol/devel .cvsignore,1.6,1.7 carol.spec,1.8,1.9

[fedora-cvs-commits at redhat.com]

Author: gbenson

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

Modified Files:
	.cvsignore carol.spec 
Log Message:
Nativify


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/carol/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Jun 2005 18:31:26 -0000	1.6
+++ .cvsignore	27 Jun 2005 15:38:20 -0000	1.7
@@ -1,4 +1,4 @@
 carol-1.8.9.3-src-RHCLEAN.tar.bz2
 carol
-noarch
+i386
 *.src.rpm


Index: carol.spec
===================================================================
RCS file: /cvs/dist/rpms/carol/devel/carol.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- carol.spec	17 Jun 2005 08:39:29 -0000	1.8
+++ carol.spec	27 Jun 2005 15:38:20 -0000	1.9
@@ -1,6 +1,6 @@
 %define name		carol
 %define version		1.8.9.3
-%define release		1jpp_1fc
+%define release		1jpp_2fc
 %define	section		free
 
 
@@ -12,7 +12,6 @@
 Epoch:		0
 License:	LGPL
 Group:		Development/Libraries/Java
-BuildArch:	noarch
 Source0:	carol-%{version}-src-RHCLEAN.tar.bz2
 Patch0:		carol-%{version}-commons-cli.patch
 Patch1:		%{name}-pr21949.patch
@@ -49,6 +48,11 @@
 Requires:  xerces-j2
 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
 
 %description
 CAROL is a library allowing to use different RMI implementations. 
@@ -101,6 +105,16 @@
 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/ow_%{name}-%{version}.db \
+    output/dist/lib/ow_%{name}.jar \
+    %{_libdir}/lib%{name}-%{version}.jar.so
+
 %install
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
@@ -119,6 +133,15 @@
         $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}
@@ -127,9 +150,17 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+/usr/bin/rebuild-gcj-db %{_libdir}
+
+%postun
+/usr/bin/rebuild-gcj-db %{_libdir}
+
 %files
 %defattr(-,root,root)
 %{_javadir}/%{name}
+%attr(0755,root,root) %{_libdir}/lib*.jar.so
+%{_libdir}/*/*/%{name}-%{version}.db
 
 %files javadoc
 %defattr(-,root,root)
@@ -137,6 +168,9 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Mon Jun 27 2005 Gary Benson <gbenson at redhat.com> 0:1.8.9.3-1jpp_2fc
+- BC-compile the combined jarfile.
+
 * Fri Jun 17 2005 Gary Benson <gbenson at redhat.com> 0:1.8.9.3-1jpp_1fc
 - Build into Fedora.