SPECS: ant.spec - finished jai task (+nonfree bcond to disable by ...

[qboosh]

Author: qboosh                       Date: Sun Apr 29 22:52:12 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- finished jai task (+nonfree bcond to disable by default all tasks which require
  non-distributable packages)

---- Files affected:
SPECS:
   ant.spec (1.80 -> 1.81) 

---- Diffs:

================================================================
Index: SPECS/ant.spec
diff -u SPECS/ant.spec:1.80 SPECS/ant.spec:1.81
--- SPECS/ant.spec:1.80	Tue Mar  6 17:44:23 2007
+++ SPECS/ant.spec	Mon Apr 30 00:52:07 2007
@@ -5,6 +5,7 @@
 #
 # Conditional build:
 %bcond_with	bootstrap	# minimal build for bootstrap
+%bcond_with	nonfree		# build tasks with non-distributable dependencies
 %bcond_without	antlr		# disable building antlr optional task(s)
 %bcond_without	apache_bcel	# disable building apache-bcel optional task(s)
 %bcond_without	apache_bsf	# disable building apache-bsf optional task(s)
@@ -14,13 +15,16 @@
 %bcond_without	apache_resolver	# disable building apache-resolver optional task(s)
 %bcond_without	commons_logging	# disable building commons-logging optional task(s)
 %bcond_without	commons_net	# disable building commons-net optional task(s)
-%bcond_with	jai		# enable building jai optional task(s)
+%bcond_without	jai		# disable building jai optional task(s)
 %bcond_without	javamail	# disable building javamail optional task(s)
 %bcond_with	jdepend		# enable building jdepend optional task(s)
 %bcond_without	jsch		# disable building jsch optional task(s)
 %bcond_without	junit		# disable building junit optional task(s)
 %bcond_without	netrexx		# disable building netrexx optional taks(s)
 #
+%if !%{with nonfree}
+%undefine	with_jai
+%endif
 %if %{with bootstrap}
 %undefine	with_antlr
 %undefine	with_apache_bcel
@@ -60,6 +64,7 @@
 %{?with_commons_net:BuildRequires:	jakarta-commons-net}
 %{?with_apache_oro:BuildRequires:	jakarta-oro}
 %{?with_apache_regexp:BuildRequires:	jakarta-regexp}
+%{?with_jai:BuildRequires:	jai}
 %{?with_javamail:BuildRequires:	javamail}
 BuildRequires:	jaxp_parser_impl
 BuildRequires:	jdk
@@ -538,7 +543,7 @@
 %{?with_apache_resolver:required_jars="$required_jars resolver"}
 %{?with_commons_logging:required_jars="$required_jars commons-logging"}
 %{?with_commons_net:required_jars="$required_jars commons-net"}
-%{?with_jai:required_jars="$required_jars jait"}
+%{?with_jai:required_jars="$required_jars jai_core jai_codec"}
 %{?with_apache_bcel:required_jars="$required_jars bcel"}
 %{?with_apache_log4j:required_jars="$required_jars log4j"}
 %{?with_apache_oro:required_jars="$required_jars oro"}
@@ -883,6 +888,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.81  2007/04/29 22:52:07  qboosh
+- finished jai task (+nonfree bcond to disable by default all tasks which require
+  non-distributable packages)
+
 Revision 1.80  2007/03/06 16:44:23  qrczak
 - BR: xml-commons-resolver when --with apache_resolver
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ant.spec?r1=1.80&r2=1.81&f=u