diff --git a/ant.spec b/ant.spec index f978556ec74ef4c3c0438fc4afe85eb866f0348e..25a5c81c65444b5e27736beeb856856cda75a151 100644 --- a/ant.spec +++ b/ant.spec @@ -3,8 +3,8 @@ Name: ant Summary: A Java-based build tool -Version: 1.10.12 -Release: 3 +Version: 1.10.13 +Release: 1 Epoch: 0 License: ASL 2.0 URL: https://ant.apache.org/ @@ -12,8 +12,6 @@ Source0: https://archive.apache.org/dist/ant/source/apache-ant-%{version} Source1: ant.asciidoc Source2: apache-ant-1.8.ant.conf -Patch0001: backport-Fix-integer-overflow-when-parsing-SOURCE_DATE_EPOCH.patch - BuildRequires: javapackages-local java-1.8.0-devel ant >= 1.10.2 BuildRequires: ant-junit xmlto mvn(antlr:antlr) mvn(bcel:bcel) BuildRequires: mvn(bsf:bsf) mvn(com.jcraft:jsch) mvn(commons-logging:commons-logging-api) @@ -362,101 +360,4 @@ LC_ALL=en_US.utf8 %{ant} test %config(noreplace) %{_sysconfdir}/%{name}.d/commons-logging %files commons-net -f .mfiles-commons-net -%{ant_home}/lib/%{name}-commons-net.jar -%config(noreplace) %{_sysconfdir}/%{name}.d/commons-net - -%files apache-bcel -f .mfiles-apache-bcel -%{ant_home}/lib/%{name}-apache-bcel.jar -%config(noreplace) %{_sysconfdir}/%{name}.d/apache-bcel - -%files apache-log4j -f .mfiles-apache-log4j -%{ant_home}/lib/%{name}-apache-log4j.jar -%config(noreplace) %{_sysconfdir}/%{name}.d/apache-log4j - -%files apache-oro -f .mfiles-apache-oro -%{ant_home}/lib/%{name}-apache-oro.jar -%config(noreplace) %{_sysconfdir}/%{name}.d/apache-oro -%{ant_home}/etc/maudit-frames.xsl - -%files apache-regexp -f .mfiles-apache-regexp -%{ant_home}/lib/%{name}-apache-regexp.jar -%config(noreplace) %{_sysconfdir}/%{name}.d/apache-regexp - -%files apache-xalan2 -f .mfiles-apache-xalan2 -%{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 - -%files jdepend -f .mfiles-jdepend -%{ant_home}/lib/%{name}-jdepend.jar -%config(noreplace) %{_sysconfdir}/%{name}.d/jdepend -%{ant_home}/etc/jdepend.xsl -%{ant_home}/etc/jdepend-frames.xsl - -%files jsch -f .mfiles-jsch -%{ant_home}/lib/%{name}-jsch.jar -%config(noreplace) %{_sysconfdir}/%{name}.d/jsch - -%files junit -f .mfiles-junit -%{ant_home}/lib/%{name}-junit.jar -%{ant_home}/lib/%{name}-junit4.jar -%config(noreplace) %{_sysconfdir}/%{name}.d/junit -%config(noreplace) %{_sysconfdir}/%{name}.d/junit4 -%{ant_home}/etc/junit-frames.xsl -%{ant_home}/etc/junit-noframes.xsl -%{ant_home}/etc/junit-frames-xalan1.xsl -%{ant_home}/etc/junit-frames-saxon.xsl -%{ant_home}/etc/junit-noframes-saxon.xsl - -%files junit5 -f .mfiles-junitlauncher -%{ant_home}/lib/%{name}-junitlauncher.jar -%config(noreplace) %{_sysconfdir}/%{name}.d/junitlauncher - -%files testutil -f .mfiles-testutil -%{ant_home}/lib/%{name}-testutil.jar -%config(noreplace) %{_sysconfdir}/%{name}.d/testutil - -%files xz -f .mfiles-xz -%{ant_home}/lib/%{name}-xz.jar -%config(noreplace) %{_sysconfdir}/%{name}.d/xz - -%files help -%license LICENSE NOTICE -%doc KEYS README WHATSNEW -%doc manual/* -%{_javadocdir}/%{name} - -%changelog -* Fri Apr 18 2025 Ge Wang - 0:1.10.12-3 -- remove invalid testcase due to junit5 updated - -* Mon Dec 02 2024 zhaosaisai - 0:1.10.12-2 -- Add Fix-integer-overflow-when-parsing-SOURCE_DATE_EPOCH - -* Fri Jan 21 2022 SimpleUpdate Robot - 1.10.12-1 -- Upgrade to version 1.10.12 - -* Mon Jul 19 2021 yaoxin - 0:1.10.8-4 -- Fix CVE-2021-36373 CVE-2021-36374 - -* Mon Nov 30 2020 huanghaitao - 0:1.10.8-3 -- Fix CVE-2020-11979 - -* Thu Oct 15 2020 lingsheng - 0:1.10.8-2 -- Change buildrequire and require to java-1.8.0-devel - -* Wed Sep 9 2020 zhanghua - 0:1.10.8-1 -- update to 1.10.8 - -* Sat Mar 14 2020 zhujunhao - 0:1.10.5-7 -- Split ant pack into subpackets - -* Fri Feb 14 2020 gulining - 0:1.10.5-6 -- Package init +%{ant_home}/lib/%{name}- \ No newline at end of file diff --git a/apache-ant-1.10.12-src.tar.bz2 b/apache-ant-1.10.13-src.tar.bz2 similarity index 36% rename from apache-ant-1.10.12-src.tar.bz2 rename to apache-ant-1.10.13-src.tar.bz2 index 9f8aaa14d61a783cfef0255dafb320c71efe135b..09c681145d2abd6ec04c23f5272026e8b2834982 100644 Binary files a/apache-ant-1.10.12-src.tar.bz2 and b/apache-ant-1.10.13-src.tar.bz2 differ