rpms/joram/devel joram.spec,1.7,1.8

[fedora-cvs-commits redhat com]

Author: gbenson

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

Modified Files:
	joram.spec 
Log Message:
Switch to aot-compile-rpm


Index: joram.spec
===================================================================
RCS file: /cvs/dist/rpms/joram/devel/joram.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- joram.spec	28 Jun 2005 14:34:56 -0000	1.7
+++ joram.spec	2 Aug 2005 08:56:14 -0000	1.8
@@ -53,10 +53,9 @@
 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
+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
 JORAM incorporates a 100% pure Java implementation of JMS
@@ -113,19 +112,6 @@
 
 ant -f src/joram.xml build.joram javadoc
 
-gcj-dbtool -n build/%{name}-%{version}.db 2048
-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}
@@ -142,35 +128,27 @@
         $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}
 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)
 %doc licenses/LGPL_HEADER.TXT
 %{_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)