packages: ant/ant.spec - ant-commons-net task is for commons-net1

[pawelz]

Author: pawelz                       Date: Mon Apr 19 13:04:52 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- ant-commons-net task is for commons-net1

---- Files affected:
packages/ant:
   ant.spec (1.119 -> 1.120) 

---- Diffs:

================================================================
Index: packages/ant/ant.spec
diff -u packages/ant/ant.spec:1.119 packages/ant/ant.spec:1.120
--- packages/ant/ant.spec:1.119	Mon Apr 19 13:04:11 2010
+++ packages/ant/ant.spec	Mon Apr 19 15:04:43 2010
@@ -75,7 +75,7 @@
 %{?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}
@@ -279,7 +279,7 @@
 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
 
@@ -559,7 +559,7 @@
 %{?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"}
@@ -635,7 +635,7 @@
 
 %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}
@@ -903,6 +903,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.120  2010/04/19 13:04:43  pawelz
+- ant-commons-net task is for commons-net1
+
 Revision 1.119  2010/04/19 11:04:11  pawelz
 - give bootstrap_release macro one more chance
 
================================================================

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