X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ant.spec;h=5ff30d57b4130d92e41c12523a4c6a371eec94c5;hb=5dd94498a59f6ca176fd7d9042539f7f3b12b957;hp=cead7c3992a63741cd8a166c9700316dea977e04;hpb=f1114d8ac019214efb4905ce598a9bbc853961a9;p=packages%2Fant.git diff --git a/ant.spec b/ant.spec index cead7c3..5ff30d5 100644 --- a/ant.spec +++ b/ant.spec @@ -25,12 +25,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 @@ -53,14 +47,14 @@ %include /usr/lib/rpm/macros.java -%define _rel 5 +%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 Summary(pl.UTF-8): Ant - narzędzie do budowania w Javie Name: ant Version: 1.7.1 -Release: %{_rel}%{?with_bootstrap:.bootstrap} +Release: %{bootstrap_release %_rel} License: Apache Group: Development/Languages/Java Source0: http://www.apache.org/dist/ant/source/apache-%{name}-%{version}-src.tar.bz2 @@ -73,32 +67,30 @@ 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} -%{?with_javamail:BuildRequires: jaf} -%{?with_jai:BuildRequires: jai} -%{?with_apache_bcel:BuildRequires: jakarta-bcel} +%{?with_javamail:BuildRequires: java(jaf)} +%{?with_jai:BuildRequires: java(jai)} +%{?with_javamail:BuildRequires: java(javamail)} +%{?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_commons_net:BuildRequires: java-commons-net1} +%{?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: jpackage-utils -%{?with_javamail:BuildRequires: javamail} -%{?with_jdepend:BuildRequires: jdepend} +BuildRequires: jdk 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 @@ -286,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 @@ -324,8 +316,8 @@ Summary(fr.UTF-8): Taches javamail optionelles pour %{name} Summary(pl.UTF-8): Opcjonalne zadania javamail dla anta Group: Development/Languages/Java Requires: %{name} = %{version}-%{release} -Requires: jaf -Requires: javamail >= 1.2 +Requires: java(jaf) +Requires: java(javamail) >= 1.2 Conflicts: ant-optional-clean Conflicts: ant-optional-full @@ -566,13 +558,13 @@ 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"} %{?with_apache_oro:required_jars="$required_jars oro"} %{?with_apache_regexp:required_jars="$required_jars regexp"} -%{?with_javamail:required_jars="$required_jars mailapi activation"} +%{?with_javamail:required_jars="$required_jars mail activation"} %{?with_jdepend:required_jars="$required_jars jdepend"} %{?with_jsch:required_jars="$required_jars jsch"} %{?with_netrexx:required_jars="$required_jars NetRexxC"} @@ -632,17 +624,17 @@ echo "bsf ant/ant-apache-bsf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-b %if %{with apache_resolver} install build/lib/%{name}-apache-resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-resolver-%{version}.jar -echo "xml-commons-resolver ant/ant-apache-resolver" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-resolver +echo "resolver ant/ant-apache-resolver" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-resolver %endif %if %{with commons_logging} install build/lib/%{name}-commons-logging.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-commons-logging-%{version}.jar -echo "jakarta-commons-logging ant/ant-commons-logging" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-logging +echo "commons-logging ant/ant-commons-logging" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-logging %endif %if %{with commons_net} install build/lib/%{name}-commons-net.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-commons-net-%{version}.jar -echo "jakarta-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} @@ -678,7 +670,7 @@ ln -sf %{name}-apache-regexp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jaka %if %{with javamail} install build/lib/%{name}-javamail.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-javamail-%{version}.jar -echo "javamail/mailapi jaf ant/ant-javamail" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/javamail +echo "mail jaf ant/ant-javamail" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/javamail %endif %if %{with jdepend}