Author: pawelz Date: Sun Jul 19 13:29:06 2009 GMT Module: packages Tag: HEAD ---- Log message: - renamed some dependencies (jakarta-... -> java-...) - rel 5
---- Files affected: packages/ant: ant.spec (1.109 -> 1.110) ---- Diffs: ================================================================ Index: packages/ant/ant.spec diff -u packages/ant/ant.spec:1.109 packages/ant/ant.spec:1.110 --- packages/ant/ant.spec:1.109 Thu Feb 19 13:27:16 2009 +++ packages/ant/ant.spec Sun Jul 19 15:29:01 2009 @@ -1,5 +1,6 @@ # $Revision$, $Date$ # TODO +# - review config files in /etc/ant.d. Something seems to be broken there. # - prepare all BR and test the full build # TODO: # - stylebook: http://svn.apache.org/viewcvs.cgi/xml/stylebook/ @@ -45,7 +46,7 @@ %undefine with_netrexx %endif # -%define _rel 4 +%define _rel 5 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 @@ -69,10 +70,10 @@ %{?with_javamail:BuildRequires: jaf} %{?with_jai:BuildRequires: jai} %{?with_apache_bcel:BuildRequires: jakarta-bcel} -%{?with_commons_logging:BuildRequires: jakarta-commons-logging} -%{?with_commons_net:BuildRequires: jakarta-commons-net} -%{?with_apache_oro:BuildRequires: jakarta-oro} -%{?with_apache_regexp:BuildRequires: jakarta-regexp} +%{?with_commons_logging:BuildRequires: java-commons-logging} +%{?with_commons_net:BuildRequires: java-commons-net} +%{?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_javamail:BuildRequires: javamail} @@ -81,7 +82,7 @@ %{?with_jsch:BuildRequires: jsch >= 0.1.21} %{?with_junit:BuildRequires: junit} %{?with_apache_bsf:BuildRequires: jython} -%{?with_apache_log4j:BuildRequires: logging-log4j >= 1.2} +%{?with_apache_log4j:BuildRequires: java-log4j >= 1.2} %{?with_netrexx:BuildRequires: netrexx} BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.300 @@ -175,7 +176,7 @@ Summary(pl.UTF-8): Opcjonalne zadania apache log4j dla anta Group: Development/Languages/Java Requires: %{name} = %{version}-%{release} -Requires: logging-log4j >= 1.2 +Requires: java-log4j >= 1.2 Provides: ant-jakarta-log4j = %{version}-%{release} Obsoletes: ant-jakarta-log4j Conflicts: ant-optional-clean @@ -196,7 +197,7 @@ Summary(pl.UTF-8): Opcjonalne zadania apache oro dla anta Group: Development/Languages/Java Requires: %{name} = %{version}-%{release} -Requires: jakarta-oro +Requires: java-oro Provides: ant-jakarta-oro = %{version}-%{release} Obsoletes: ant-jakarta-oro Conflicts: ant-optional-clean @@ -217,7 +218,7 @@ Summary(pl.UTF-8): Opcjonalne zadania apache regexp dla anta Group: Development/Languages/Java Requires: %{name} = %{version}-%{release} -Requires: jakarta-regexp +Requires: java-regexp Obsoletes: ant-jakarta-regexp Conflicts: ant-optional-clean Conflicts: ant-optional-full @@ -237,7 +238,7 @@ Summary(pl.UTF-8): Opcjonalne zadania apache resolver dla anta Group: Development/Languages/Java Requires: %{name} = %{version}-%{release} -Requires: xml-commons-resolver +Requires: java-xml-commons-resolver Provides: ant-apache-resolver = %{version}-%{release} Conflicts: ant-optional-clean Conflicts: ant-optional-full @@ -273,7 +274,7 @@ Summary(pl.UTF-8): Opcjonalne zadania commons net dla anta Group: Development/Languages/Java Requires: %{name} = %{version}-%{release} -Requires: jakarta-commons-net +Requires: java-commons-net Conflicts: ant-optional-clean Conflicts: ant-optional-full @@ -480,10 +481,10 @@ Summary(fr.UTF-8): Scripts additionels pour %{name} Summary(pl.UTF-8): Dodatkowe skrypty dla anta Group: Development/Languages/Java -AutoReqProv: no Requires: %{name} = %{version}-%{release} Requires: /usr/bin/perl Requires: /usr/bin/python +AutoReqProv: no %description scripts Additional Perl and Python scripts for %{name}. @@ -897,6 +898,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.110 2009/07/19 13:29:01 pawelz +- renamed some dependencies (jakarta-... -> java-...) +- rel 5 + Revision 1.109 2009/02/19 12:27:16 pawelz - do not R: jdk ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ant/ant.spec?r1=1.109&r2=1.110&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
