rpms/xml-commons/devel xml-commons.spec,1.28,1.29

[fedora-cvs-commits redhat com]

Author: gbenson

Update of /cvs/dist/rpms/xml-commons/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4482

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


Index: xml-commons.spec
===================================================================
RCS file: /cvs/dist/rpms/xml-commons/devel/xml-commons.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xml-commons.spec	27 Jun 2005 13:13:03 -0000	1.28
+++ xml-commons.spec	15 Jul 2005 15:48:20 -0000	1.29
@@ -3,7 +3,7 @@
 Summary:        Common code for XML projects
 Name:           xml-commons
 Version:        1.0
-Release:        0.b2.7jpp_2fc
+Release:        0.b2.7jpp_3fc
 Epoch:          0
 License:        Apache Software License
 URL:            http://xml.apache.org/commons/
@@ -17,9 +17,7 @@
 Group:          Text Processing/Markup/XML
 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
-ExclusiveArch:  %{ix86} x86_64 ppc alpha
+BuildRequires:  java-gcj-compat-devel >= 1.0.31
 
 %description
 xml-commons is focused on common code and guidelines for xml projects.
@@ -36,7 +34,8 @@
 Group:          Text Processing/Markup/XML
 Requires:       %{name} = %{epoch}:%{version}-%{release}
 # libgcj aot-compiled native libraries
-Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh
+Requires(post):   java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
 
 %description apis
 APIs subproject of %{name}.
@@ -89,16 +88,6 @@
 %build
 ant jars
 
-gcj-dbtool -n java/external/build/%{name}-%{version}.db 512
-aot-compile \
-    java/external/build/xml-apis.jar \
-    java/external/build/lib%{name}-apis-%{version}.jar.so \
-    "$RPM_OPT_FLAGS -fPIC"
-gcj-dbtool -f \
-    java/external/build/%{name}-%{version}.db \
-    java/external/build/xml-apis.jar \
-    %{_libdir}/lib%{name}-apis-%{version}.jar.so
-
 # -----------------------------------------------------------------------------
 
 %install
@@ -114,15 +103,6 @@
 # Jar versioning
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 
-# solibs
-mkdir -p $RPM_BUILD_ROOT%{_libdir}
-cp -p java/external/build/lib*.jar.so $RPM_BUILD_ROOT%{_libdir}
-
-# gcjdb
-gcjdbdir=`gcj-dbtool -p %{_libdir}`.d
-mkdir -p $RPM_BUILD_ROOT$gcjdbdir
-cp -p java/external/build/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
-
 # Javadocs
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-apis-%{version}
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-which-%{version}
@@ -138,6 +118,8 @@
 # prevent apis javadoc from being included in doc
 rm -rf java/external/build/docs/javadoc
 
+aot-compile-rpm
+
 # -----------------------------------------------------------------------------
 
 %clean
@@ -152,13 +134,14 @@
 %files apis
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}-apis*
-%attr(0755,root,root) %{_libdir}/*.so
-%{_libdir}/*/*/*.db
+%dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-apis-%{version}.jar.*
 
 %files which
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}-which*
 %attr(0755,root,root) %{_bindir}/*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-which-%{version}.jar.*
 
 %files apis-manual
 %defattr(0644,root,root,0755)
@@ -175,10 +158,10 @@
 # -----------------------------------------------------------------------------
 
 %post apis
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
 
 %postun apis
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
 
 %post apis-javadoc
 rm -f %{_javadocdir}/%{name}-apis
@@ -201,6 +184,10 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Fri Jul 15 2005 Gary Benson <gbenson redhat com> - 0:1.0-0.b2.7jpp_3fc
+- Build on ia64, ppc64, s390 and s390x.
+- Switch to aot-compile-rpm (also BC-compiles the which jar).
+
 * Wed Jun 15 2005 Gary Benson <gbenson redhat com> - 0:1.0-0.b2.7jpp_2fc
 - Remove all prebuilt stuff from the tarball.