rpms/jakarta-commons-logging/devel jakarta-commons-logging.spec, 1.24, 1.25

[fedora-cvs-commits redhat com]

Author: gbenson

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

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


Index: jakarta-commons-logging.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-logging/devel/jakarta-commons-logging.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- jakarta-commons-logging.spec	27 Jun 2005 13:13:01 -0000	1.24
+++ jakarta-commons-logging.spec	15 Jul 2005 13:12:49 -0000	1.25
@@ -5,7 +5,7 @@
 
 Name:           %{name}
 Version:        1.0.4
-Release:        2jpp_5fc
+Release:        2jpp_6fc
 Epoch:          0
 Summary:        Jakarta Commons Logging Package
 License:        Apache Software License
@@ -18,10 +18,9 @@
 # RHEL3 and FC2
 Obsoletes:      %{short_name} <= 0:1.0.2
 # 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 commons-logging package provides a simple, component oriented
@@ -59,16 +58,6 @@
 
 ant compile.tests dist
 
-gcj-dbtool -n dist/%{name}-%{version}.db 64
-aot-compile \
-    dist/%{short_name}.jar \
-    dist/lib%{name}-%{version}.jar.so \
-    "$RPM_OPT_FLAGS -fPIC"
-gcj-dbtool -f \
-    dist/%{name}-%{version}.db \
-    dist/%{short_name}.jar \
-    %{_libdir}/lib%{name}-%{version}.jar.so
-
 # -----------------------------------------------------------------------------
 
 %install
@@ -83,13 +72,8 @@
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-# solibs
-install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
-install -m 755 dist/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 dist/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
+
+aot-compile-rpm
 
 # -----------------------------------------------------------------------------
 
@@ -103,10 +87,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-logging < 1.1
 pushd %{_javadir} &> /dev/null
@@ -131,8 +115,7 @@
 %defattr(0644,root,root,0755)
 %doc PROPOSAL.html STATUS.html LICENSE.txt RELEASE-NOTES.txt
 %{_javadir}/*
-%attr(0755,root,root) %{_libdir}/*.so
-%{_libdir}/*/*/*.db
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 
 %files javadoc
 %defattr(0644,root,root,0755)
@@ -141,6 +124,10 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Fri Jul 15 2005 Gary Benson <gbenson redhat com> - 0:1.0.4-2jpp_6fc
+- Build on ia64, ppc64, s390 and s390x.
+- Switch to aot-compile-rpm.
+
 * Wed May 25 2005 Gary Benson <gbenson redhat com> - 0:1.0.4-2jpp_5fc
 - Rearrange how BC-compiled stuff is built and installed.