SPECS: xalan-j.spec - needs xml-apis.jar from new xml-commons-exte...

[qboosh]

Author: qboosh                       Date: Sun Jan  7 19:47:13 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- needs xml-apis.jar from new xml-commons-external to compile

---- Files affected:
SPECS:
   xalan-j.spec (1.33 -> 1.34) 

---- Diffs:

================================================================
Index: SPECS/xalan-j.spec
diff -u SPECS/xalan-j.spec:1.33 SPECS/xalan-j.spec:1.34
--- SPECS/xalan-j.spec:1.33	Sat Jan  6 20:16:58 2007
+++ SPECS/xalan-j.spec	Sun Jan  7 20:47:08 2007
@@ -1,11 +1,7 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	docs	# do not build documentation
-#
-# TODO:
-#	- FIXME: xalan-interpretive needs org.w3c.dom.xpath, which is in included xml-commons-external only
-#	- build with external xml-commons? (is there new version available?)
+%bcond_without	docs	# do not build documentation (takes a looong time)
 #
 %define	_ver	%(echo %{version} | tr . _)
 Summary:	XSLT processor for Java
@@ -26,6 +22,7 @@
 BuildRequires:	jlex
 BuildRequires:	jpackage-utils
 BuildRequires:	rpmbuild(macros) >= 1.300
+BuildRequires:	xml-commons-external >= 1.3
 # servlet provided by jakarta-servletapi.spec
 # also resin.spec, resin-cmp.spec seem to provide it by simple grep.
 BuildRequires:	servlet
@@ -71,18 +68,18 @@
 
 find . -name "*.jar" ! -name "xalan2jdoc.jar" ! -name "stylebook-1.0-b3_xalan-2.jar" -exec rm -f {} \;
 
+# copied to xalan.jar (TODO: don't do it and use system ones?)
+ln -sf %{_javadir}/bcel.jar lib/BCEL.jar
+ln -sf %{_javadir}/regexp.jar lib/regexp.jar
+ln -sf %{_javadir}/java_cup-runtime.jar lib/runtime.jar
+
 %build
 export JAVA_HOME=%{java_home}
 export JAVAC=%{javac}
 export JAVA=%{java}
-required_jars='servlet java_cup java_cup-runtime jlex bcel jaxp_parser_impl'
+required_jars='servlet java_cup java_cup-runtime jlex bcel jaxp_parser_impl xml-apis'
 export CLASSPATH="`/usr/bin/build-classpath $required_jars`"
 
-# XXX: is it needed? other jars are not symlinked
-ln -sf %{_javadir}/bcel.jar lib/BCEL.jar
-ln -sf %{_javadir}/regexp.jar lib/regexp.jar
-ln -sf %{_javadir}/java_cup-runtime.jar lib/runtime.jar
-
 %ant xsltc.unbundledjar servlet %{?with_docs:docs xsltc.docs javadocs samples}
 
 %install
@@ -105,8 +102,8 @@
 
 %files
 %defattr(644,root,root,755)
+%doc %{?with_docs:build/docs/design build/docs/xsltc}
 %{_javadir}/*.jar
-%doc NOTICE %{?with_docs:build/docs/design build/docs/xsltc}
 
 %if %{with docs}
 %files javadoc
@@ -124,6 +121,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.34  2007/01/07 19:47:08  qboosh
+- needs xml-apis.jar from new xml-commons-external to compile
+
 Revision 1.33  2007/01/06 19:16:58  qboosh
 - removed obsolete dom3 path, updated ln paths; still doesn't build
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xalan-j.spec?r1=1.33&r2=1.34&f=u