From b2c5dba92c589a6c2d2ad6ef90dd4afaee55c95a Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 20:27:31 +0100
Subject: [PATCH] update to 1.10.9 [release 1.10.9-1mamba;Tue Dec 22 2020]

---
 apache-ant.spec | 47 ++++++++++++++++++++++++++++++++++-------------
 1 file changed, 34 insertions(+), 13 deletions(-)

diff --git a/apache-ant.spec b/apache-ant.spec
index 1b53e55..bb167b3 100644
--- a/apache-ant.spec
+++ b/apache-ant.spec
@@ -1,12 +1,12 @@
 Name:          apache-ant
-Version:       1.9.15
+Version:       1.10.9
 Release:       1mamba
 Summary:       A Java-based build tool
 Group:         Applications/Development
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           http://ant.apache.org
+URL:           https://ant.apache.org
 Source0:       http://mirror.nohup.it/apache/ant/source/apache-ant-%{version}-src.tar.bz2
 Source1:       ant-profile.sh
 Source2:       apache-ant-bin_ant
@@ -16,9 +16,14 @@ License:       Apache License 2.0
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: perl-devel
 ## AUTOBUILDREQ-END
-BuildRequires: java-openjdk
+%ifnarch arm
+BuildRequires: java-environment
+%endif
 BuildRequires: java-junit
+BuildRequires: java-hamcrest
+BuildConflicts: apache-ant < 1.10
 Requires:      java-junit
+Requires:      java-hamcrest
 Obsoletes:     apache-ant-nodeps
 Provides:      apache-ant-nodeps = %{?epoch:%epoch:}%{version}-%{release}
 Obsoletes:     apache-ant-trax
@@ -68,7 +73,6 @@ Provides:      apache-ant-javadoc
 Obsoletes:     apache-ant-javadoc
 Provides:      apache-ant-regexp
 Obsoletes:     apache-ant-regexp
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
 Apache Ant is a Java-based build tool. In theory, it is kind of like Make, but without Make's wrinkles.
@@ -82,22 +86,33 @@ Documentation for ant.
 
 %prep
 %setup -q
-%patch0 -p1
+#-D -T
+#%patch0 -p1
 
 %build
-# ant needs HOME to download libs to $HOME/.m2/repository
-export ANT_OPTS="-Duser.home=`pwd`"
-%ifarch arm
-export LD_PRELOAD=%{_libdir}/libatomic.so.1
+%ifnarch arm
+export JAVA_HOME=%{_jvmdir}/jdk
+export JAVACMD=%{_jvmdir}/jdk/bin/java
 %endif
-ant -Ddest=optional -f fetch.xml
 
-rm lib/optional/junit-4.12.jar
+%ifarch arm
+export JAVA_HOME=~/zulu11.43.100-ca-jdk11.0.9.1-linux_aarch32sf
+%endif
+# ant needs HOME to download libs to $HOME/.m2/repository
+#export ANT_OPTS="-Duser.home=`pwd`"
+
+./bootstrap.sh
+
+bootstrap/bin/ant -Ddest=optional -f fetch.xml
+
+rm -f lib/optional/junit-4.12.jar
 ln -s %{_javadir}/junit.jar lib/optional/junit-4.12.jar
-rm lib/optional/hamcrest-core-1.3.jar
+rm -f lib/optional/hamcrest-core-1.3.jar
 ln -s %{_javadir}/hamcrest-core.jar lib/optional/hamcrest-core-1.3.jar
+rm -f lib/optional/hamcrest-library-1.3.jar
+ln -s %{_javadir}/hamcrest-library.jar lib/optional/hamcrest-library-1.3.jar
 
-ant dist
+bootstrap/bin/ant dist
 
 %install
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
@@ -157,6 +172,7 @@ cp -r manual/* %{buildroot}%{_docdir}/apache-ant/
 %{_datadir}/java/apache-ant/ant-apache-xalan2.jar
 %{_datadir}/java/apache-ant/ant-commons-logging.jar
 %{_datadir}/java/apache-ant/ant-commons-net.jar
+%{_datadir}/java/apache-ant/ant-imageio.jar
 %{_datadir}/java/apache-ant/ant-jai.jar
 %{_datadir}/java/apache-ant/ant-javamail.jar
 %{_datadir}/java/apache-ant/ant-jdepend.jar
@@ -168,6 +184,8 @@ cp -r manual/* %{buildroot}%{_docdir}/apache-ant/
 %{_datadir}/java/apache-ant/ant-netrexx.jar
 %{_datadir}/java/apache-ant/ant-swing.jar
 %{_datadir}/java/apache-ant/ant-testutil.jar
+%{_datadir}/java/apache-ant/ant-junitlauncher.jar
+%{_datadir}/java/apache-ant/ant-xz.jar
 %{_datadir}/java/apache-ant/ant.jar
 %{_datadir}/apache-ant/bin/ant
 %{_datadir}/apache-ant/bin/antRun
@@ -181,6 +199,9 @@ cp -r manual/* %{buildroot}%{_docdir}/apache-ant/
 %{_docdir}/apache-ant/*
 
 %changelog
+* Tue Dec 22 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 1.10.9-1mamba
+- update to 1.10.9
+
 * Sun Oct 11 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 1.9.15-1mamba
 - update to 1.9.15