packages: java-xalan/java-xalan.spec - added servlet bcond - BR java(jaxp_p...

[qboosh]

Author: qboosh                       Date: Fri Feb 11 16:42:30 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added servlet bcond
- BR java(jaxp_parser_impl) instead of java-xerves

---- Files affected:
packages/java-xalan:
   java-xalan.spec (1.65 -> 1.66) 

---- Diffs:

================================================================
Index: packages/java-xalan/java-xalan.spec
diff -u packages/java-xalan/java-xalan.spec:1.65 packages/java-xalan/java-xalan.spec:1.66
--- packages/java-xalan/java-xalan.spec:1.65	Sun Apr 18 18:05:18 2010
+++ packages/java-xalan/java-xalan.spec	Fri Feb 11 17:42:24 2011
@@ -2,7 +2,8 @@
 #
 # Conditional build:
 %bcond_without	doc	# do not build documentation
-
+%bcond_without	servlet	# don't build servlet sample
+#
 %define		ver	%(echo %{version} | tr . _)
 %define		srcname	xalan
 %include	/usr/lib/rpm/macros.java
@@ -18,10 +19,10 @@
 Patch0:		xalan-j-javadoc-mem.patch
 URL:		http://xml.apache.org/xalan-j/
 BuildRequires:	ant >= 1.5
-BuildRequires:	jakarta-bcel
-BuildRequires:	java(servlet)
+BuildRequires:	java(jaxp_parser_impl)
+%{?with_servlet:BuildRequires:	java(servlet)}
+BuildRequires:	java-bcel
 BuildRequires:	java-cup
-BuildRequires:	java-xerces
 BuildRequires:	java-xml-commons-external
 BuildRequires:	jdk
 BuildRequires:	jlex
@@ -83,12 +84,12 @@
 export JAVA_HOME=%{java_home}
 export JAVAC=%{javac}
 export JAVA=%{java}
-required_jars='servlet-api cup cup-runtime jlex bcel jaxp_parser_impl xerces-j2 xml-apis'
+required_jars='%{?with_servlet:servlet-api} cup cup-runtime jlex bcel jaxp_parser_impl xml-apis'
 CLASSPATH=$(build-classpath $required_jars)
 export CLASSPATH
 export ANT_OPTS="-Xmx192m"
 
-%ant xsltc.unbundledjar servlet \
+%ant xsltc.unbundledjar %{?with_servlet:servlet} \
 	%{?with_doc:docs xsltc.docs javadocs samples}
 
 %install
@@ -114,7 +115,13 @@
 %files
 %defattr(644,root,root,755)
 %doc %{?with_doc:build/docs/design build/docs/xsltc}
-%{_javadir}/*.jar
+%{_javadir}/jaxp_transform_impl.jar
+%{_javadir}/serializer-%{version}.jar
+%{_javadir}/serializer.jar
+%{_javadir}/xalan-%{version}.jar
+%{_javadir}/xalan.jar
+%{_javadir}/xsltc-%{version}.jar
+%{_javadir}/xsltc.jar
 
 %if %{with doc}
 %files javadoc
@@ -132,6 +139,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.66  2011/02/11 16:42:24  qboosh
+- added servlet bcond
+- BR java(jaxp_parser_impl) instead of java-xerves
+
 Revision 1.65  2010/04/18 16:05:18  pawelz
 - don't force specific jdk
 - updated java deps
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-xalan/java-xalan.spec?r1=1.65&r2=1.66&f=u