SPECS: batik.spec - added bootstrap bcond that allows to break BR-loop - do...

[pawelz]

Author: pawelz                       Date: Tue Dec 30 21:21:14 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added bootstrap bcond that allows to break BR-loop
- don't use jar files provided with sources when building without bootstrap

---- Files affected:
SPECS:
   batik.spec (1.26 -> 1.27) 

---- Diffs:

================================================================
Index: SPECS/batik.spec
diff -u SPECS/batik.spec:1.26 SPECS/batik.spec:1.27
--- SPECS/batik.spec:1.26	Mon Dec 29 16:26:23 2008
+++ SPECS/batik.spec	Tue Dec 30 22:21:09 2008
@@ -1,10 +1,10 @@
 # $Revision$, $Date$
 # TODO:
 # - generate docs without using forrest. It seems to be possible.
-# - do not use pdf-transcoder.jar from batik sources. See comments in %%prep
 #
 # Conditional build:
 %bcond_with	docs		# build with docs (require apache-forrest)
+%bcond_with	bootstrap	# break BR loop batik-fop
 #
 Summary:	Java SVG support
 Summary(pl.UTF-8):	Wsparcie dla SVG dla języka Java
@@ -18,6 +18,7 @@
 Patch0:		%{name}-nodocs.patch
 URL:		http://xml.apache.org/batik/
 %{?with_docs:BuildRequires:	apache-forrest}
+%{?without_bootstrap:BuildRequires:	fop}
 BuildRequires:	jdk >= 1.4
 BuildRequires:	jpackage-utils
 BuildRequires:	rhino
@@ -57,19 +58,17 @@
 %patch0 -p0
 %endif
 
-#
-# We do want to use system libs
-# problem:
-#   pdf-transcoder.jar is provided by fop, but this spec is BR for for. So we
-#   have to use pdf-transcoder.jar from batik sources.
-#
-
 br_jars='js xalan xercesImpl xml-apis xml-apis-ext'
 rm lib/js.jar lib/xalan*.jar lib/xerces*.jar lib/xml-apis*.jar
 for jar in $br_jars; do
   ln -s $(find-jar $jar) lib
 done
 
+%if %{without bootstrap}
+  rm lib/pdf-transcoder.jar
+  ln -s $(find-jar fop-transcoder) lib
+%endif
+
 %build
 unset CLASSPATH || :
 export JAVA_HOME="%{java_home}"
@@ -93,10 +92,9 @@
   install $jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$jar
 done
 
-#
-# get rid of this jar!!! see TODO
-#
-install pdf-transcoder.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/pdf-transcoder.jar
+%if %{with bootstrap}
+  install pdf-transcoder.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/pdf-transcoder.jar
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -119,6 +117,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2008/12/30 21:21:09  pawelz
+- added bootstrap bcond that allows to break BR-loop
+- don't use jar files provided with sources when building without bootstrap
+
 Revision 1.26  2008/12/29 15:26:23  pawelz
 - dependencies
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/batik.spec?r1=1.26&r2=1.27&f=u