rpms/geronimo-specs/devel geronimo-specs.spec,1.6,1.7

[fedora-cvs-commits at redhat.com]

Author: gbenson

Update of /cvs/dist/rpms/geronimo-specs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28533

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


Index: geronimo-specs.spec
===================================================================
RCS file: /cvs/dist/rpms/geronimo-specs/devel/geronimo-specs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- geronimo-specs.spec	29 Jun 2005 13:36:11 -0000	1.6
+++ geronimo-specs.spec	22 Jul 2005 13:05:14 -0000	1.7
@@ -23,10 +23,9 @@
 Requires:	servletapi5
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-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
 Geronimo is Apache's ASF-licenced J2EE server project.
@@ -83,19 +82,6 @@
     jar cf $jarfile -C $classdir .
 done
 
-gcj-dbtool -n build/lib/%{name}-%{version}.db 512
-for jar in build/lib/*.jar; do
-    jar=`basename $jar .jar`
-    aot-compile \
-        build/lib/$jar.jar \
-        build/lib/lib$jar-%{version}.jar.so \
-        "$RPM_OPT_FLAGS -fPIC"
-    gcj-dbtool -f \
-        build/lib/%{name}-%{version}.db \
-        build/lib/$jar.jar \
-        %{_libdir}/lib$jar-%{version}.jar.so
-done
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -110,34 +96,32 @@
     ln -s %{bname}/$base.jar $RPM_BUILD_ROOT%{_javadir}/$compat.jar
 done
 
-install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
-install -m 755 build/lib/lib*.jar.so $RPM_BUILD_ROOT%{_libdir}
-
-gcjdbdir=`gcj-dbtool -p %{_libdir}`.d
-install -d -m 755 $RPM_BUILD_ROOT$gcjdbdir
-install -m 644 build/lib/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
+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 LICENSE.txt NOTICE.txt
 %{_javadir}/%{bname}
-%attr(0755,root,root) %{_libdir}/*.so
-%{_libdir}/*/*/*.db
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 
 %files compat
 %defattr(-,root,root,-)
 %{_javadir}/*.jar
 
 %changelog
+* Fri Jul 22 2005 Gary Benson <gbenson at redhat.com>
+- Switch to aot-compile-rpm.
+- Build on ia64, ppc64, s390 and s390x.
+
 * Wed Jun 29 2005 Gary Benson <gbenson at redhat.com> 0:1.0-0.M2.2jpp_3fc
 - Add dependency on the main package to the compatibility subpackage.