X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ant.spec;h=5ff30d57b4130d92e41c12523a4c6a371eec94c5;hb=5dd94498a59f6ca176fd7d9042539f7f3b12b957;hp=672151668af5c8ea3f1c12b2cdc7897eac549ad3;hpb=7041cfe05897e98e6dcc29b78b12e530e2d72622;p=packages%2Fant.git diff --git a/ant.spec b/ant.spec index 6721516..5ff30d5 100644 --- a/ant.spec +++ b/ant.spec @@ -1,4 +1,5 @@ # 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/ @@ -23,7 +24,7 @@ %bcond_without jsch # disable building jsch optional task(s) %bcond_without junit # disable building junit optional task(s) %bcond_without netrexx # disable building netrexx optional taks(s) -# + %if %{without nonfree} %undefine with_jai %endif @@ -43,15 +44,17 @@ %undefine with_jsch %undefine with_netrexx %endif -# -%define _rel 4 + +%include /usr/lib/rpm/macros.java + +%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 @@ -62,30 +65,32 @@ Patch0: %{name}-antRun.patch # next release of ant. 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_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_javamail:BuildRequires: javamail} -BuildRequires: jaxp_parser_impl -%{?with_jdepend:BuildRequires: jdepend} -BuildRequires: java-gcj-compat-devel +%{?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-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} +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: logging-log4j >= 1.2} -%{?with_netrexx:BuildRequires: netrexx} +%{?with_apache_log4j:BuildRequires: java-log4j >= 1.2} +BuildRequires: rpm >= 4.4.9-56 +BuildRequires: rpm-javaprov BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.300 -%{?with_apache_resolver:BuildRequires: xml-commons-resolver} -Requires: jdk Requires: jpackage-utils Obsoletes: jakarta-ant BuildArch: noarch @@ -175,7 +180,7 @@ Summary(fr.UTF-8): Taches apache log4j optionelles pour %{name} 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 +201,7 @@ Summary(fr.UTF-8): Taches apache oro optionelles pour %{name} 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 +222,7 @@ Summary(fr.UTF-8): Taches apache regexp optionelles pour %{name} 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 +242,7 @@ Summary(fr.UTF-8): Taches apache resolver optionelles pour %{name} 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 +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: jakarta-commons-net +Requires: java-commons-net1 Conflicts: ant-optional-clean Conflicts: ant-optional-full @@ -311,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 @@ -480,10 +485,10 @@ Summary: Additional scripts for %{name} 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}. @@ -553,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"} @@ -619,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} @@ -665,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} @@ -711,13 +716,13 @@ ln -nfs %{name}-%{version} %{_javadocdir}/%{name} %{_javadir}/%{name}-launcher-%{version}.jar %dir %{_javadir}/%{name} %dir %{ant_home} -%dir %{ant_home}/etc -%{ant_home}/etc/ant-update.xsl -%{ant_home}/etc/changelog.xsl -%{ant_home}/etc/common2master.xsl -%{ant_home}/etc/log.xsl -%{ant_home}/etc/tagdiff.xsl -%{ant_home}/etc/junit-frames-xalan1.xsl +%dir %{ant_home}%{_sysconfdir} +%{ant_home}%{_sysconfdir}/ant-update.xsl +%{ant_home}%{_sysconfdir}/changelog.xsl +%{ant_home}%{_sysconfdir}/common2master.xsl +%{ant_home}%{_sysconfdir}/log.xsl +%{ant_home}%{_sysconfdir}/tagdiff.xsl +%{ant_home}%{_sysconfdir}/junit-frames-xalan1.xsl %dir %{ant_home}/lib %dir %{_sysconfdir}/%{name}.d %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf @@ -763,7 +768,7 @@ ln -nfs %{name}-%{version} %{_javadocdir}/%{name} %{_javadir}/%{name}/%{name}-apache-oro-%{version}.jar %{_javadir}/%{name}/%{name}-jakarta-oro.jar %{_sysconfdir}/%{name}.d/apache-oro -%{ant_home}/etc/maudit-frames.xsl +%{ant_home}%{_sysconfdir}/maudit-frames.xsl %endif %if %{with apache_regexp} @@ -821,8 +826,8 @@ ln -nfs %{name}-%{version} %{_javadocdir}/%{name} %{_javadir}/%{name}/%{name}-jdepend.jar %{_javadir}/%{name}/%{name}-jdepend-%{version}.jar %{_sysconfdir}/%{name}.d/jdepend -%{ant_home}/etc/jdepend.xsl -%{ant_home}/etc/jdepend-frames.xsl +%{ant_home}%{_sysconfdir}/jdepend.xsl +%{ant_home}%{_sysconfdir}/jdepend-frames.xsl %endif %files jmf @@ -845,8 +850,8 @@ ln -nfs %{name}-%{version} %{_javadocdir}/%{name} %{_javadir}/%{name}/%{name}-junit.jar %{_javadir}/%{name}/%{name}-junit-%{version}.jar %{_sysconfdir}/%{name}.d/junit -%{ant_home}/etc/junit-frames.xsl -%{ant_home}/etc/junit-noframes.xsl +%{ant_home}%{_sysconfdir}/junit-frames.xsl +%{ant_home}%{_sysconfdir}/junit-noframes.xsl %endif %if %{with netrexx} @@ -874,8 +879,8 @@ ln -nfs %{name}-%{version} %{_javadocdir}/%{name} %{_javadir}/%{name}/%{name}-trax.jar %{_javadir}/%{name}/%{name}-trax-%{version}.jar %{_sysconfdir}/%{name}.d/trax -%{ant_home}/etc/mmetrics-frames.xsl -%{ant_home}/etc/coverage-frames.xsl +%{ant_home}%{_sysconfdir}/mmetrics-frames.xsl +%{ant_home}%{_sysconfdir}/coverage-frames.xsl %files scripts %defattr(644,root,root,755)