.ant.metadata

@@ -1 +1 @@
-7760da2f3f5708ee0975caf634df16d5567fffe5 SOURCES/apache-ant-1.10.9-src.tar.bz2
+24ceef44b43cd2726c865d0de5168a84a1cb30c7 SOURCES/apache-ant-1.10.7-src.tar.bz2

.gitignore

@@ -1 +1 @@
-SOURCES/apache-ant-1.10.9-src.tar.bz2
+SOURCES/apache-ant-1.10.7-src.tar.bz2

SOURCES/ant-build.xml.patch

@@ -1,6 +1,15 @@
---- build.xml~	2021-05-17 12:32:48.406394876 +0200
+--- apache-ant-1.10.7/build.xml~	2019-10-31 14:10:07.739864466 +0100
-+++ build.xml	2021-05-17 12:32:39.990389601 +0200
++++ apache-ant-1.10.7/build.xml	2019-10-31 14:10:12.018897830 +0100
-@@ -819,7 +817,6 @@
+@@ -145,8 +145,6 @@
+      -->
+     <pathelement location="${src.junit}"/>
+     <pathelement location="${tests.etc.dir}"/>
+-    <!-- Otherwise many tests fail with "com.sun.tools.javac.Main is not on the classpath.": -->
+-    <pathelement location="${java.home}/../lib/tools.jar"/>
+   </path>
+ 
+   <!--
+@@ -801,7 +799,6 @@
        </metainf>
        <manifest>
          <attribute name="Main-Class" value="org.apache.tools.ant.Main"/>
@@ -8,9 +17,9 @@
        </manifest>
      </jar>
  
-@@ -1562,7 +1559,25 @@
+@@ -1543,7 +1540,25 @@
-              verbose="${javadoc.verbose}"
+              maxmemory="1000M"
-              additionalparam="${javadoc.doclint.none}">
+              verbose="${javadoc.verbose}">
  
 -      <packageset dir="${java.dir}"/>
 +      <fileset dir="${java.dir}">

SPECS/ant.spec

@@ -31,14 +31,14 @@
 %global ant_home %{_datadir}/ant
 
 Name:           ant
-Version:        1.10.9
+Version:        1.10.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Java build tool
 Summary(it):    Tool per la compilazione di programmi java
 Summary(fr):    Outil de compilation pour java
 License:        ASL 2.0
 URL:            https://ant.apache.org/
-Source0:        https://archive.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2
+Source0:        https://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2
 Source2:        apache-ant-1.8.ant.conf
 # manpage
 Source3:        ant.asciidoc
@@ -71,6 +71,8 @@ BuildRequires:  mvn(xml-resolver:xml-resolver)
 BuildRequires:  mvn(org.hamcrest:hamcrest-core)
 BuildRequires:  mvn(org.hamcrest:hamcrest-library)
 
+BuildRequires:  junit5
+
 # Theoretically Ant might be usable with just JRE, but typical Ant
 # workflow requires full JDK, so we recommend it here.
 %if 0%{?fedora} || 0%{?rhel} > 7
@@ -282,6 +284,16 @@ Optional junit tasks for %{name}.
 %description junit -l fr
 Taches junit optionelles pour %{name}.
 
+%package junit5
+Summary:        Optional junit5 tasks for %{name}
+Requires:       %{name} = %{version}-%{release}
+
+%description junit5
+Optional junit5 tasks for %{name}.
+
+%description junit5 -l fr
+Taches junit5 optionelles pour %{name}.
+
 %package testutil
 Summary:        Test utility classes for %{name}
 Requires:       %{name} = %{version}-%{release}
@@ -321,7 +333,7 @@ Javadoc pour %{name}.
 
 %prep
 %setup -q -n apache-ant-%{version}
-%patch0 -p0
+%patch0 -p1
 
 # clean jar files
 find . -name "*.jar" | xargs -t rm
@@ -338,7 +350,7 @@ rm src/tests/junit/org/apache/tools/ant/types/selectors/SignedSelectorTest.java
    src/tests/junit/org/apache/tools/mail/MailMessageTest.java
 
 #install jars
-build-jar-repository -s -p lib/optional antlr bcel javamail/mailapi jdepend junit log4j-1 oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xalan-j2-serializer hamcrest/core hamcrest/library xz-java
+build-jar-repository -s -p lib/optional antlr bcel javamail/mailapi jdepend junit log4j-1 oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xalan-j2-serializer hamcrest/core hamcrest/library xz-java junit5 opentest4j
 
 # fix hardcoded paths in ant script and conf
 cp -p %{SOURCE2} %{name}.conf
@@ -373,8 +385,6 @@ xmlto man man/%{name}.xml -o man
 rm -fr build/lib/ant-jai.jar build/lib/ant-netrexx.jar
 # -----------------------------------------------------------------------------
 
-rm -fr build/lib/ant-junitlauncher.jar
-
 %install
 # ANT_HOME and subdirs
 mkdir -p $RPM_BUILD_ROOT%{ant_home}/{lib,etc,bin}
@@ -453,6 +463,7 @@ echo "jdepend ant/ant-jdepend" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jdepend
 echo "jsch ant/ant-jsch" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jsch
 echo "junit hamcrest/core ant/ant-junit" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit
 echo "junit hamcrest/core ant/ant-junit4" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit4
+echo "junit5 hamcrest/core junit opentest4j ant/ant-junitlauncher" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junitlauncher
 echo "testutil ant/ant-testutil" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/testutil
 echo "xz-java ant/ant-xz" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/xz
 
@@ -468,7 +479,11 @@ install -d -m 755 %{buildroot}%{_mandir}/man1/
 install -p -m 644 man/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
 
 %check
+%if 0%{?rhel} && 0%{?rhel} <= 7
+export LC_ALL=en_US.UTF-8
+%else
 export LC_ALL=C.UTF-8
+%endif
 %{ant} test
 
 %files
@@ -578,6 +593,10 @@ export LC_ALL=C.UTF-8
 %{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
@@ -597,9 +616,6 @@ export LC_ALL=C.UTF-8
 # -----------------------------------------------------------------------------
 
 %changelog
-* Tue Jan 30 2024 Marián Konček <mkoncek@redhat.com> - 1.10.9-1
-- Update to upstream version 1.10.9
-
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.7-2
 - Mass rebuild for javapackages-tools 201902