packages: ant/ant.spec - jdk BRs - include java rpm macros - BR ant (unless...

[pawelz]

Author: pawelz                       Date: Mon Jul 20 05:50:59 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- jdk BRs
- include java rpm macros
- BR ant (unless with bootstrap)

---- Files affected:
packages/ant:
   ant.spec (1.110 -> 1.111) 

---- Diffs:

================================================================
Index: packages/ant/ant.spec
diff -u packages/ant/ant.spec:1.110 packages/ant/ant.spec:1.111
--- packages/ant/ant.spec:1.110	Sun Jul 19 15:29:01 2009
+++ packages/ant/ant.spec	Mon Jul 20 07:50:53 2009
@@ -25,7 +25,13 @@
 %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 "%{pld_release}" == "ti"
+%bcond_without	java_sun	# build with gcj
+%else
+%bcond_with	java_sun	# build with java-sun
+%endif
+
 %if %{without nonfree}
 %undefine	with_jai
 %endif
@@ -45,7 +51,9 @@
 %undefine	with_jsch
 %undefine	with_netrexx
 %endif
-#
+
+%include	/usr/lib/rpm/macros.java
+
 %define		_rel	5
 Summary:	Ant build tool for Java
 Summary(fr.UTF-8):	Outil de compilation pour java
@@ -64,6 +72,7 @@
 # next release of ant.
 Patch1:		%{name}-gcjtask.patch
 URL:		http://ant.apache.org/
+%{!?with_bootstrap:BuildRequires:	ant}
 %{?with_antlr:BuildRequires:	antlr}
 %{?with_apache_bsf:BuildRequires:	beanshell}
 %{?with_apache_bsf:BuildRequires:	bsf}
@@ -72,10 +81,12 @@
 %{?with_apache_bcel:BuildRequires:	jakarta-bcel}
 %{?with_commons_logging:BuildRequires:	java-commons-logging}
 %{?with_commons_net:BuildRequires:	java-commons-net}
+%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
 %{?with_apache_oro:BuildRequires:	java-oro}
 %{?with_apache_regexp:BuildRequires:	java-regexp}
-BuildRequires:	java-gcj-compat-devel
 %{?with_apache_resolver:BuildRequires:	java-xml-commons-resolver}
+%{?with_java_sun:BuildRequires:	java-sun}
+BuildRequires:	jpackage-utils
 %{?with_javamail:BuildRequires:	javamail}
 %{?with_jdepend:BuildRequires:	jdepend}
 BuildRequires:	jpackage-utils
@@ -84,6 +95,8 @@
 %{?with_apache_bsf:BuildRequires:	jython}
 %{?with_apache_log4j:BuildRequires:	java-log4j >= 1.2}
 %{?with_netrexx:BuildRequires:	netrexx}
+BuildRequires:	rpm >= 4.4.9-56
+BuildRequires:	rpm-javaprov
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	xerces-j
@@ -898,6 +911,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.111  2009/07/20 05:50:53  pawelz
+- jdk BRs
+- include java rpm macros
+- BR ant (unless with bootstrap)
+
 Revision 1.110  2009/07/19 13:29:01  pawelz
 - renamed some dependencies (jakarta-... -> java-...)
 - rel 5
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ant/ant.spec?r1=1.110&r2=1.111&f=u