rpms/jakarta-commons-digester/devel jakarta-commons-digester.spec, 1.22, 1.23

[fedora-cvs-commits redhat com]

Author: gbenson

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

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


Index: jakarta-commons-digester.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-digester/devel/jakarta-commons-digester.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jakarta-commons-digester.spec	27 Jun 2005 13:13:01 -0000	1.22
+++ jakarta-commons-digester.spec	19 Jul 2005 10:34:45 -0000	1.23
@@ -2,7 +2,7 @@
 %define short_name      commons-%{base_name}
 %define name            jakarta-%{short_name}
 %define version         1.6
-%define release         2jpp_5fc
+%define release         2jpp_6fc
 %define section         free
 
 Name:           %{name}
@@ -26,10 +26,9 @@
 # RHEL3 and FC2
 Obsoletes:      %{short_name} <= 1.4.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 goal of Digester project is to create and maintain a XML -> Java
@@ -58,16 +57,6 @@
 
 rm ../LICENSE
 
-gcj-dbtool -n dist/%{name}-%{version}.db 256
-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
 rm -rf $RPM_BUILD_ROOT
 
@@ -82,14 +71,7 @@
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
-# solibs
-mkdir -p $RPM_BUILD_ROOT%{_libdir}
-cp -p dist/lib*.jar.so $RPM_BUILD_ROOT%{_libdir}
-
-# gcjdb
-gcjdbdir=`gcj-dbtool -p %{_libdir}`.d
-mkdir -p $RPM_BUILD_ROOT$gcjdbdir
-cp -p dist/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
+aot-compile-rpm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -99,10 +81,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-digester < 1.5
 pushd %{_javadir} &> /dev/null
@@ -123,14 +105,17 @@
 %defattr(0644,root,root,0755)
 %doc LICENSE.txt PROPOSAL.html STATUS.html 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)
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Tue Jul 19 2005 Gary Benson <gbenson redhat com> - 0:1.6-2jpp_6fc
+- Build on ia64, ppc64, s390 and s390x.
+- Switch to aot-compile-rpm (also BC-compiles rss jarfile).
+
 * Wed May 25 2005 Gary Benson <gbenson redhat com> - 0:1.6-2jpp_5fc
 - Rearrange how BC-compiled stuff is built and installed.