packages: ant/ant.spec - dependency names updated

[jajcus]

Author: jajcus                       Date: Sun Apr 18 13:34:02 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- dependency names updated

---- Files affected:
packages/ant:
   ant.spec (1.116 -> 1.117) 

---- Diffs:

================================================================
Index: packages/ant/ant.spec
diff -u packages/ant/ant.spec:1.116 packages/ant/ant.spec:1.117
--- packages/ant/ant.spec:1.116	Sat Apr 17 18:36:09 2010
+++ packages/ant/ant.spec	Sun Apr 18 15:33:56 2010
@@ -26,12 +26,6 @@
 %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
@@ -54,7 +48,7 @@
 
 %include	/usr/lib/rpm/macros.java
 
-%define		_rel	5
+%define		_rel	6
 Summary:	Ant build tool for Java
 Summary(fr.UTF-8):	Outil de compilation pour java
 Summary(it.UTF-8):	Tool per la compilazione di programmi java
@@ -74,32 +68,30 @@
 URL:		http://ant.apache.org/
 %{!?with_bootstrap:BuildRequires:	ant}
 %{?with_antlr:BuildRequires:	antlr}
-%{?with_apache_bsf:BuildRequires:	beanshell}
-%{?with_apache_bsf:BuildRequires:	bsf}
 %{?with_javamail:BuildRequires:	java(jaf)}
 %{?with_jai:BuildRequires:	java(jai)}
-%{?with_apache_bcel:BuildRequires:	jakarta-bcel}
+%{?with_javamail:BuildRequires:	java(mail)}
+%{?with_apache_bsf:BuildRequires:	java-beanshell}
+%{?with_apache_bcel:BuildRequires:	java-bcel}
+%{?with_apache_bsf:BuildRequires:	java-bsf}
 %{?with_commons_logging:BuildRequires:	java-commons-logging}
 %{?with_commons_net:BuildRequires:	java-commons-net}
-%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
+%{?with_jdepend:BuildRequires:	java-jdepend}
+%{?with_netrexx:BuildRequires:	java-netrexx}
 %{?with_apache_oro:BuildRequires:	java-oro}
 %{?with_apache_regexp:BuildRequires:	java-regexp}
+%{?with_jsch:BuildRequires:	java-jsch >= 0.1.21}
+BuildRequires:	java-xerces
 %{?with_apache_resolver:BuildRequires:	java-xml-commons-resolver}
-%{?with_java_sun:BuildRequires:	java-sun}
+BuildRequires:	jdk
 BuildRequires:	jpackage-utils
-%{?with_javamail:BuildRequires:	java-mail}
-%{?with_jdepend:BuildRequires:	jdepend}
-BuildRequires:	jpackage-utils
-%{?with_jsch:BuildRequires:	jsch >= 0.1.21}
 %{?with_junit:BuildRequires:	junit}
 %{?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
 Requires:	jpackage-utils
 Obsoletes:	jakarta-ant
 BuildArch:	noarch
@@ -325,8 +317,8 @@
 Summary(pl.UTF-8):	Opcjonalne zadania javamail dla anta
 Group:		Development/Languages/Java
 Requires:	%{name} = %{version}-%{release}
-Requires:	jaf
-Requires:	java-mail >= 1.2
+Requires:	java(jaf)
+Requires:	java(javamail) >= 1.2
 Conflicts:	ant-optional-clean
 Conflicts:	ant-optional-full
 
@@ -911,6 +903,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.117  2010/04/18 13:33:56  jajcus
+- dependency names updated
+
 Revision 1.116  2010/04/17 16:36:09  jajcus
 - jai->java(jai), jaf->java(jaf)
 
================================================================

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