rpms/joram/devel .cvsignore,1.4,1.5 joram.spec,1.5,1.6

[fedora-cvs-commits at redhat.com]

Author: gbenson

Update of /cvs/dist/rpms/joram/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14007

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/joram/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Jun 2005 18:04:06 -0000	1.4
+++ .cvsignore	28 Jun 2005 13:24:14 -0000	1.5
@@ -1,4 +1,4 @@
 joram-4.1.5-src-RHCLEAN.tar.bz2
 joram-4.1.5
-noarch
+i386
 *.src.rpm


Index: joram.spec
===================================================================
RCS file: /cvs/dist/rpms/joram/devel/joram.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- joram.spec	22 Jun 2005 09:04:14 -0000	1.5
+++ joram.spec	28 Jun 2005 13:24:14 -0000	1.6
@@ -1,6 +1,6 @@
 %define name		joram
 %define version		4.1.5
-%define release		1jpp_2fc
+%define release		1jpp_3fc
 %define	section		free
 
 
@@ -12,7 +12,6 @@
 Epoch:		0
 License:	LGPL
 Group:		Development/Libraries/Java
-BuildArch:	noarch
 Source0:	joram-%{version}-src-RHCLEAN.tar.bz2
 Patch0:		joram-monolog-Debug.patch
 Patch1:		joram-mx4j.patch
@@ -53,6 +52,11 @@
 #Requires:	soap
 Requires:	xerces-j2
 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
 JORAM incorporates a 100% pure Java implementation of JMS
@@ -109,6 +113,19 @@
 
 ant -f src/joram.xml build.joram javadoc
 
+gcj-dbtool -n build/%{name}-%{version}.db 1024
+for jar in build/%{name}-*.jar; do
+    jar=`basename $jar .jar`
+    aot-compile \
+        build/$jar.jar \
+        build/lib$jar-%{version}.jar.so \
+        "$RPM_OPT_FLAGS -fPIC"
+    gcj-dbtool -f \
+        build/%{name}-%{version}.db \
+        build/$jar.jar \
+        %{_libdir}/lib$jar-%{version}.jar.so
+done
+
 %install
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
@@ -125,6 +142,15 @@
         $RPM_BUILD_ROOT%{_javadir}/%{name}/gui-%{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 build/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 build/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
+
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -133,10 +159,18 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+/usr/bin/rebuild-gcj-db %{_libdir}
+
+%postun
+/usr/bin/rebuild-gcj-db %{_libdir}
+
 %files
 %defattr(-,root,root)
 %doc licenses/LGPL_HEADER.TXT
 %{_javadir}/%{name}
+%attr(0755,root,root) %{_libdir}/lib*.jar.so
+%{_libdir}/*/*/%{name}-%{version}.db
 
 %files javadoc
 %defattr(-,root,root)
@@ -144,6 +178,9 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Tue Jun 28 2005 Gary Benson <gbenson at redhat.com> 0:4.1.5-1jpp_3fc
+- BC-compile.
+
 * Wed Jun 22 2005 Gary Benson <gbenson at redhat.com> 0:4.1.5-1jpp_2fc
 - Remove warfile from the tarball too.