rpms/jakarta-commons-collections/devel jakarta-commons-collections.spec, 1.29, 1.30

[fedora-cvs-commits redhat com]

Author: gbenson

Update of /cvs/dist/rpms/jakarta-commons-collections/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9511

Modified Files:
	jakarta-commons-collections.spec 
Log Message:
Build on ia64, ppc64, s390 and s390x


Index: jakarta-commons-collections.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-collections/devel/jakarta-commons-collections.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- jakarta-commons-collections.spec	27 Jun 2005 13:13:01 -0000	1.29
+++ jakarta-commons-collections.spec	19 Jul 2005 10:05:17 -0000	1.30
@@ -2,7 +2,7 @@
 %define short_name	commons-%{base_name}
 %define name		jakarta-%{short_name}
 %define version		3.1
-%define release		2jpp_1fc
+%define release		2jpp_2fc
 %define	section		free
 
 Name:		%{name}
@@ -23,10 +23,9 @@
 # RHEL3 and FC2
 Obsoletes:	%{short_name} <= 0:2.1
 # 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
 The introduction of the Collections API by Sun in JDK 1.2 has been a
@@ -59,16 +58,6 @@
 %build
 ant -Djava.io.tmpdir=. jar javadoc
 
-gcj-dbtool -n build/%{name}-%{version}.db 1024
-aot-compile \
-    build/%{short_name}-%{version}.jar \
-    build/lib%{name}-%{version}.jar.so \
-    "$RPM_OPT_FLAGS -fPIC"
-gcj-dbtool -f \
-    build/%{name}-%{version}.db \
-    build/%{short_name}-%{version}.jar \
-    %{_libdir}/lib%{name}-%{version}.jar.so
-
 %install
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
@@ -78,13 +67,8 @@
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr build/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-# 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
+
+aot-compile-rpm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -95,10 +79,10 @@
 rm -f %{_javadir}/%{name}*.jar
 
 %post
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
 
 %postun
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
 
 %triggerpostun -- commons-collections < 3.0
 pushd %{_javadir} &> /dev/null
@@ -119,14 +103,17 @@
 %defattr(0644,root,root,0755)
 %doc PROPOSAL.html README.txt STATUS.html LICENSE.txt RELEASE-NOTES.html
 %{_javadir}/*
-%attr(0755,root,root) %{_libdir}/*.so
-%{_libdir}/*/*/*.db
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Tue Jul 19 2005 Gary Benson <gbenson at redhat.com> - 0:3.1-2jpp_2fc
+- Build on ia64, ppc64, s390 and s390x.
+- Switch to aot-compile-rpm.
+
 * Tue Jun 14 2005 Gary Benson <gbenson at redhat.com> - 0:3.1-2jpp_1fc
 - Remove jarfiles from the tarball.