rpms/xerces-j2/devel xerces-j2.spec,1.32,1.33

[fedora-cvs-commits at redhat.com]

Author: gbenson

Update of /cvs/dist/rpms/xerces-j2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22537

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


Index: xerces-j2.spec
===================================================================
RCS file: /cvs/dist/rpms/xerces-j2/devel/xerces-j2.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xerces-j2.spec	27 Jun 2005 13:13:02 -0000	1.32
+++ xerces-j2.spec	18 Jul 2005 13:24:10 -0000	1.33
@@ -1,7 +1,7 @@
 %define name		xerces-j2
 %define version		2.6.2
 %define cvs_version	2_6_2
-%define release		5jpp_1fc
+%define release		5jpp_2fc
 %define section		free
 
 Name:		%{name}
@@ -33,10 +33,9 @@
 # RHEL3 and FC2
 Obsoletes:	xerces-j <= 0:2.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
 Welcome to the future! Xerces2 is the next generation of high
@@ -134,16 +133,6 @@
 	-Djar.resolver=xml-commons-resolver.jar \
 	clean jars javadocs
 
-gcj-dbtool -n build/%{name}-%{version}.db 2048
-aot-compile \
-    build/xercesImpl.jar \
-    build/lib%{name}-%{version}.jar.so \
-    "$RPM_OPT_FLAGS -fPIC"
-gcj-dbtool -f \
-    build/%{name}-%{version}.db \
-    build/xercesImpl.jar \
-    %{_libdir}/lib%{name}-%{version}.jar.so
-
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -153,15 +142,6 @@
 cp -p build/xercesImpl.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 (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 build/lib*.jar.so $RPM_BUILD_ROOT%{_libdir}
-
-# gcjdb
-gcjdbdir=`gcj-dbtool -p %{_libdir}`.d
-mkdir -p $RPM_BUILD_ROOT$gcjdbdir
-cp -p build/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
-
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-impl-%{version}
 cp -pr build/docs/javadocs/xerces2/* \
@@ -205,6 +185,8 @@
 ln -s %{_sysconfdir}/alternatives \
   $RPM_BUILD_ROOT%{_javadir}/jaxp_parser_impl.jar
 
+aot-compile-rpm
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -235,7 +217,7 @@
 %post
 update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
   jaxp_parser_impl %{_javadir}/%{name}.jar 40
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
 
 %preun
 {
@@ -244,15 +226,21 @@
 } >/dev/null 2>&1 || :
 
 %postun
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
+
+%post demo
+%{_bindir}/rebuild-gcj-db
+
+%postun demo
+%{_bindir}/rebuild-gcj-db
 
 %files
 %defattr(0644,root,root,0755)
 %doc LICENSE README ISSUES STATUS TODO
 %{_javadir}/%{name}*.jar
 %ghost %{_javadir}/jaxp_parser_impl.jar
-%attr(0755,root,root) %{_libdir}/*.so
-%{_libdir}/*/*/*.db
+%dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
 
 %files javadoc-impl
 %defattr(0644,root,root,0755)
@@ -282,6 +270,7 @@
 %files demo
 %defattr(0644,root,root,0755)
 %{_datadir}/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-samples.jar.*
 
 %files scripts
 %defattr(0755,root,root,0755)
@@ -289,6 +278,10 @@
 
 
 %changelog
+* Mon Jul 18 2005 Gary Benson <gbenson at redhat.com> 0:2.6.2-5jpp_2fc
+- Build on ia64, ppc64, s390 and s390x.
+- Switch to aot-compile-rpm (also BC-compiles samples).
+
 * Wed Jun 15 2005 Gary Benson <gbenson at redhat.com> 0:2.6.2-5jpp_1fc
 - Upgrade to 2.6.2-5jpp.