diff --git a/.gitignore b/.gitignore index b9ed924..c1dd4d2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,11 @@ -apache-ant-1.7.1-src.tar.bz2 +/results_* +/*.src.rpm + +/apache-ant-1.7.1-src.tar.bz2 /apache-ant-1.8.1-src.tar.bz2 -apache-ant-1.8.2-src.tar.bz2 -apache-ant-1.8.3-src.tar.bz2 -apache-ant-1.8.4-src.tar.bz2 +/apache-ant-1.8.2-src.tar.bz2 +/apache-ant-1.8.3-src.tar.bz2 +/apache-ant-1.8.4-src.tar.bz2 /apache-ant-1.9.0-src.tar.bz2 /apache-ant-1.9.1-src.tar.bz2 /apache-ant-1.9.2-src.tar.bz2 @@ -17,3 +20,4 @@ apache-ant-1.8.4-src.tar.bz2 /apache-ant-1.10.3-src.tar.bz2 /apache-ant-1.10.4-src.tar.bz2 /apache-ant-1.10.5-src.tar.bz2 +/apache-ant-1.10.6-src.tar.bz2 diff --git a/ant.spec b/ant.spec index 84ac6f9..39e0ee2 100644 --- a/ant.spec +++ b/ant.spec @@ -35,8 +35,8 @@ %global ant_home %{_datadir}/ant Name: ant -Version: 1.10.5 -Release: 6%{?dist} +Version: 1.10.6 +Release: 1%{?dist} Epoch: 0 Summary: Java build tool Summary(it): Tool per la compilazione di programmi java @@ -249,6 +249,13 @@ Optional apache xalan2 tasks for %{name}. %description apache-xalan2 -l fr Taches apache xalan2 optionelles pour %{name}. +%package imageio +Summary: Optional imageio tasks for %{name} +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description imageio +Optional imageio tasks for %{name}. + %package javamail Summary: Optional javamail tasks for %{name} Requires: %{name} = %{epoch}:%{version}-%{release} @@ -476,6 +483,7 @@ echo "log4j12 ant/ant-apache-log4j" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/ap echo "oro ant/ant-apache-oro" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-oro echo "regexp ant/ant-apache-regexp" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-regexp echo "xalan-j2 xalan-j2-serializer ant/ant-apache-xalan2" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-xalan2 +echo "ant/ant-imageio" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/imageio echo "javamail jaf ant/ant-javamail" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/javamail echo "jdepend ant/ant-jdepend" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jdepend echo "jsch ant/ant-jsch" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jsch @@ -589,6 +597,10 @@ LC_ALL=C.UTF-8 %{ant} test %{ant_home}/lib/%{name}-apache-xalan2.jar %config(noreplace) %{_sysconfdir}/%{name}.d/apache-xalan2 +%files imageio -f .mfiles-imageio +%{ant_home}/lib/%{name}-imageio.jar +%config(noreplace) %{_sysconfdir}/%{name}.d/imageio + %files javamail -f .mfiles-javamail %{ant_home}/lib/%{name}-javamail.jar %config(noreplace) %{_sysconfdir}/%{name}.d/javamail @@ -641,6 +653,9 @@ LC_ALL=C.UTF-8 %{ant} test # ----------------------------------------------------------------------------- %changelog +* Mon Jul 29 2019 Fabio Valentini - 0:1.10.6-1 +- Update to version 1.10.6. + * Wed Jul 24 2019 Fedora Release Engineering - 0:1.10.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 646a731..9a4a12f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-ant-1.10.5-src.tar.bz2) = 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e +SHA512 (apache-ant-1.10.6-src.tar.bz2) = 94c5cfc280f0ba416b1a777e19474648c493c61c7c322044926f10cc72c210079247fa9066044f74b3bf463240aed1884066bd3e698136d94df419271820f696