BC-compile the main jarfile

.cvsignore

@@ -1,4 +1,4 @@
 xalan-j_2_6_0-src.tar.gz
 xalan-j_2_6_0
-noarch
+i386
 *.src.rpm

xalan-j2.spec

@@ -16,17 +16,19 @@ Patch3:         %{name}-bz130162.patch
 Patch4:         %{name}-bz152255.patch
 URL:            http://xml.apache.org/xalan-j/
 Group:          Text Processing/Markup/XML
-#Vendor:         JPackage Project
-#Distribution:   JPackage
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
-BuildArch:      noarch
 Provides:       jaxp_transform_impl
 Requires:       jaxp_parser_impl, /usr/sbin/update-alternatives
 BuildRequires:  ant, xml-commons-apis, bcel, servlet, jlex, java_cup, sed
 BuildRequires:  jpackage-utils >= 0:1.5, java-devel, xerces-j2
 # RHEL3 and FC2
 Obsoletes:	xalan-j <= 0:2.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
 
 %description
 Xalan is an XSLT processor for transforming XML documents into HTML,
@@ -103,6 +105,11 @@ ant \
   samples \
   servlet
 
+aot-compile \
+    build/xalan-interpretive.jar \
+    build/lib%{name}.jar.so \
+    "$RPM_OPT_FLAGS -fPIC"
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -115,6 +122,19 @@ install -p -m 644 build/xsltc.jar \
   $RPM_BUILD_ROOT%{_javadir}/xsltc-%{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%{name}.jar.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}-%{version}.jar.so
+(cd $RPM_BUILD_ROOT%{_libdir} && for so in lib*-%{version}.jar.so; do ln -sf ${so} `echo $so| sed "s|-%{version}||g"`; done)
+
+# gcjdb
+gcjdbdir=`gcj-dbtool -p %{_libdir}`.d
+mkdir -p $RPM_BUILD_ROOT$gcjdbdir
+gcj-dbtool -n $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db 80000
+gcj-dbtool -f $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db \
+  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar \
+  %{_libdir}/lib%{name}-%{version}.jar.so
+
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr build/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -146,6 +166,10 @@ rm -f %{_javadir}/%{name}.jar
 %post
 update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
   jaxp_transform_impl %{_javadir}/%{name}.jar 30
+/usr/bin/rebuild-gcj-db %{_libdir}
+
+%postun
+/usr/bin/rebuild-gcj-db %{_libdir}
 
 %preun
 {
@@ -173,6 +197,8 @@ ln -s %{name}-%{version} %{_javadocdir}/%{name}
 %{_javadir}/%{name}-%{version}.jar
 %{_javadir}/%{name}.jar
 %ghost %{_javadir}/jaxp_transform_impl.jar
+%attr(0755,root,root) %{_libdir}/lib*.jar.so
+%{_libdir}/*/*/%{name}-%{version}.db
 
 %files xsltc
 %defattr(0644,root,root,0755)
@@ -196,8 +222,9 @@ ln -s %{name}-%{version} %{_javadocdir}/%{name}
 %changelog
 * Tue May 24 2005 Gary Benson <gbenson@redhat.com>
 - Add DOM3 stubs to classes that need them (#152255).
+- BC-compile the main jarfile.
 
-* Fri Apr  1 2005 Gary Benson <gbenson at redhat.com> 0:2.6.0-2jpp_2fc
+* Fri Apr  1 2005 Gary Benson <gbenson@redhat.com>
 - Add NOTICE file as per Apache License version 2.0.
 
 * Wed Jan 12 2005 Gary Benson <gbenson@redhat.com> 0:2.6.0-2jpp_1fc