rpms/jotm/devel .cvsignore,1.6,1.7 jotm.spec,1.6,1.7

[fedora-cvs-commits at redhat.com]

Author: gbenson

Update of /cvs/dist/rpms/jotm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21321

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jotm/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Jun 2005 19:12:02 -0000	1.6
+++ .cvsignore	28 Jun 2005 13:34:05 -0000	1.7
@@ -1,4 +1,4 @@
 jotm-2.0.5-src-RHCLEAN.tar.bz2
 jotm-2.0.5
-noarch
+i386
 *.src.rpm


Index: jotm.spec
===================================================================
RCS file: /cvs/dist/rpms/jotm/devel/jotm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jotm.spec	17 Jun 2005 08:47:26 -0000	1.6
+++ jotm.spec	28 Jun 2005 13:34:05 -0000	1.7
@@ -1,6 +1,6 @@
 %define name		jotm
 %define version		2.0.5
-%define release		1jpp_1fc
+%define release		1jpp_2fc
 %define	section		free
 
 Name:		%{name}
@@ -11,7 +11,6 @@
 Epoch:		0
 License:	BSD-style
 Group:		Development/Libraries/Java
-BuildArch:	noarch
 Source0:	jotm-%{version}-src-RHCLEAN.tar.bz2
 Patch1:		%{name}-bz133180.patch
 
@@ -29,8 +28,12 @@
 BuildRequires:	oldkilim
 BuildRequires:	jacorb
 BuildRequires:	jonathan-rmi
-
 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
 Today the JOTM team delivers to you a Java Open Source 
@@ -88,6 +91,16 @@
 popd
 ant
 
+gcj-dbtool -n output/dist/lib/%{name}-%{version}.db 128
+aot-compile \
+    output/dist/lib/%{name}.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/%{name}.jar \
+    %{_libdir}/lib%{name}-%{version}.jar.so
+
 %install
 
 # jars
@@ -100,6 +113,15 @@
 #        $RPM_BUILD_ROOT%{_javadir}/%{name}/jrmp-stubs-%{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}
@@ -116,6 +138,12 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 cp -pr output/dist/doc/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
+%post
+/usr/bin/rebuild-gcj-db %{_libdir}
+
+%postun
+/usr/bin/rebuild-gcj-db %{_libdir}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -124,6 +152,8 @@
 %doc output/dist/LICENSE.txt
 %{_javadir}/%{name}
 %{_datadir}/%{name}-%{version}/conf
+%attr(0755,root,root) %{_libdir}/lib*.jar.so
+%{_libdir}/*/*/%{name}-%{version}.db
 
 %files javadoc
 %defattr(-,root,root)
@@ -139,6 +169,9 @@
 %{_docdir}/%{name}-%{version}
 
 %changelog
+* Tue Jun 28 2005 Gary Benson <gbenson at redhat.com> 0:2.0.5-1jpp_2fc
+- BC-compile.
+
 * Fri Jun 17 2005 Gary Benson <gbenson at redhat.com> 0:2.0.5-1jpp_1fc
 - Build into Fedora.