SPECS: xalan-j.spec - Release: 3 - without_docs bcond - dropped R:...

[jajcus]

Author: jajcus                       Date: Wed May 24 13:00:32 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Release: 3
- without_docs bcond
- dropped R: xml-commons

---- Files affected:
SPECS:
   xalan-j.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: SPECS/xalan-j.spec
diff -u SPECS/xalan-j.spec:1.25 SPECS/xalan-j.spec:1.26
--- SPECS/xalan-j.spec:1.25	Wed May 24 14:49:03 2006
+++ SPECS/xalan-j.spec	Wed May 24 15:00:27 2006
@@ -1,13 +1,17 @@
 # $Revision$, $Date$
-# TODO
-# - without_docs bcond; generating takes ages
+#
+# Conditional build:
+%bcond_without	docs	# do not build documentation
+#
+# TODO:
+#	- build with external xml-commons? (seems included in JRE)
 #
 %define	_ver	%(echo %{version} | tr . _)
 Summary:	XSLT processor for Java
 Summary(pl):	Procesor XSLT napisany w Javie
 Name:		xalan-j
 Version:	2.6.0
-Release:	2
+Release:	3
 License:	Apache v2.0
 Group:		Applications/Publishing/XML/Java
 Source0:	http://www.apache.org/dist/xml/xalan-j/source/%{name}_%{_ver}-src.tar.gz
@@ -20,11 +24,10 @@
 BuildRequires:	jdk >= 1.2
 BuildRequires:	jpackage-utils
 BuildRequires:	rpmbuild(macros) >= 1.300
-BuildRequires:	xml-commons
-# servlet provided by jakarta-servletapi.spec
-# also resin.spec, resin-cmp.spec seem to provide it by simple grep.
 BuildRequires:	java_cup
 BuildRequires:	jlex
+# servlet provided by jakarta-servletapi.spec
+# also resin.spec, resin-cmp.spec seem to provide it by simple grep.
 BuildRequires:	servlet
 Requires:	jaxp_parser_impl
 Requires:	jre >= 1.2
@@ -79,7 +82,12 @@
 ln -sf %{_javadir}/regexp.jar bin/regexp.jar
 ln -sf %{_javadir}/java_cup-runtime.jar bin/runtime.jar
 
+<<<<<<< xalan-j.spec
+
+%{ant} xsltc.unbundledjar servlet %{?with_docs:docs xsltc.docs javadocs samples}
+=======
 %{ant} xsltc.unbundledjar docs xsltc.docs javadocs samples servlet
+>>>>>>> 1.25
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -91,8 +99,10 @@
 ln -sf xalan-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/jaxp_transform_impl.jar
 ln -sf xsltc-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/xsltc.jar
 
+%if %{with docs}
 cp -r samples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -r build/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -100,8 +110,9 @@
 %files
 %defattr(644,root,root,755)
 %{_javadir}/*.jar
-%doc NOTICE build/docs/design build/docs/xsltc
+%doc NOTICE %{?with_docs:build/docs/design build/docs/xsltc}
 
+%if %{with docs}
 %files javadoc
 %defattr(644,root,root,755)
 %doc %{_javadocdir}/%{name}-%{version}
@@ -109,6 +120,7 @@
 %files examples
 %defattr(644,root,root,755)
 %{_examplesdir}/%{name}-%{version}
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -116,6 +128,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2006/05/24 13:00:27  jajcus
+- Release: 3
+- without_docs bcond
+- dropped R: xml-commons
+
 Revision 1.25  2006/05/24 12:49:03  qboosh
 - no macro in Obsoletes for old package
 
================================================================

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