X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ant.spec;h=5ff30d57b4130d92e41c12523a4c6a371eec94c5;hb=5dd94498a59f6ca176fd7d9042539f7f3b12b957;hp=d99fb6d58becc49a53f2ddbb3771401359e942d0;hpb=629324c0e4da963c078c334c08913a81a633d1ec;p=packages%2Fant.git

diff --git a/ant.spec b/ant.spec
index d99fb6d..5ff30d5 100644
--- a/ant.spec
+++ b/ant.spec
@@ -47,7 +47,7 @@
 
 %include	/usr/lib/rpm/macros.java
 
-%define		_rel	7
+%define		_rel	8
 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,7 +74,7 @@ URL:		http://ant.apache.org/
 %{?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_commons_net:BuildRequires:	java-commons-net1}
 %{?with_jdepend:BuildRequires:	java-jdepend}
 %{?with_netrexx:BuildRequires:	java-netrexx}
 %{?with_apache_oro:BuildRequires:	java-oro}
@@ -278,7 +278,7 @@ Summary(fr.UTF-8):	Taches commons net optionelles pour %{name}
 Summary(pl.UTF-8):	Opcjonalne zadania commons net dla anta
 Group:		Development/Languages/Java
 Requires:	%{name} = %{version}-%{release}
-Requires:	java-commons-net
+Requires:	java-commons-net1
 Conflicts:	ant-optional-clean
 Conflicts:	ant-optional-full
 
@@ -558,7 +558,7 @@ required_jars="jaxp_parser_impl"
 %{?with_apache_bsf:required_jars="$required_jars bsf jython bsh"}
 %{?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_commons_net:required_jars="$required_jars commons-net1"}
 %{?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"}
@@ -634,7 +634,7 @@ echo "commons-logging ant/ant-commons-logging" > $RPM_BUILD_ROOT%{_sysconfdir}/%
 
 %if %{with commons_net}
 install build/lib/%{name}-commons-net.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-commons-net-%{version}.jar
-echo "commons-net ant/ant-commons-net" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-net
+echo "commons-net1 ant/ant-commons-net" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-net
 %endif
 
 %if %{with jai}