packages: batik/batik.spec - unify doc bcond

[glen]

Author: glen                         Date: Fri Feb  5 08:10:58 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unify doc bcond

---- Files affected:
packages/batik:
   batik.spec (1.30 -> 1.31) 

---- Diffs:

================================================================
Index: packages/batik/batik.spec
diff -u packages/batik/batik.spec:1.30 packages/batik/batik.spec:1.31
--- packages/batik/batik.spec:1.30	Mon Jan 18 00:24:59 2010
+++ packages/batik/batik.spec	Fri Feb  5 09:10:52 2010
@@ -3,7 +3,7 @@
 # - generate docs without using forrest. It seems to be possible.
 #
 # Conditional build:
-%bcond_with	docs		# build with docs (require apache-forrest)
+%bcond_with	doc		# build with docs (require apache-forrest)
 %bcond_with	bootstrap	# break BR loop batik-fop
 #
 Summary:	Java SVG support
@@ -18,7 +18,7 @@
 Patch0:		%{name}-nodocs.patch
 URL:		http://xml.apache.org/batik/
 %{!?with_bootstrap:BuildRequires:	fop}
-%{?with_docs:BuildRequires:	java-forrest}
+%{?with_doc:BuildRequires:	java-forrest}
 BuildRequires:	java-xalan
 BuildRequires:	jdk >= 1.4
 BuildRequires:	jpackage-utils
@@ -54,7 +54,7 @@
 %prep
 %setup -q
 
-%if %{without docs}
+%if %{without doc}
 %patch0 -p0
 %endif
 
@@ -103,10 +103,11 @@
 %files
 %defattr(644,root,root,755)
 %doc CHANGES KEYS NOTICE README
+# ??? WTF dir for .jar?
 %dir %{_javadir}/batik*.jar
 %{_javadir}/%{name}
 
-%if %{with docs}
+%if %{with doc}
 %files doc
 %defattr(644,root,root,755)
 %doc %{name}-%{version}/docs/* %{name}-%{version}/samples
@@ -118,6 +119,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2010/02/05 08:10:52  glen
+- unify doc bcond
+
 Revision 1.30  2010/01/17 23:24:59  glen
 - refresh deps using adapter
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/batik/batik.spec?r1=1.30&r2=1.31&f=u