From 21a1ce2e7b6a9c8229f5b0ad3b63920cce0ebefc Mon Sep 17 00:00:00 2001
From: Didik Supriadi <didiksupriadi41@fedoraproject.org>
Date: Dec 15 2021 12:31:13 +0000
Subject: Import new spec


---

diff --git a/.gitignore b/.gitignore
index ed4c755..9c78c41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
 /apache-ant-antunit-1.2-src.tar.bz2
 /apache-ant-antunit-1.3-src.tar.bz2
 /apache-ant-antunit-1.4-src.tar.bz2
+/apache-ant-antunit-1.4.1-src.tar.bz2
+/KEYS
+/apache-ant-antunit-1.4.1-src.tar.bz2.asc
diff --git a/ant-antunit-local.patch b/ant-antunit-local.patch
deleted file mode 100644
index 4ce5fa8..0000000
--- a/ant-antunit-local.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up apache-ant-antunit-1.4/common/ivy.xml.local apache-ant-antunit-1.4/common/ivy.xml
---- apache-ant-antunit-1.4/common/ivy.xml.local	2018-06-21 23:25:04.000000000 -0600
-+++ apache-ant-antunit-1.4/common/ivy.xml	2020-07-11 18:42:29.334518248 -0600
-@@ -127,7 +127,7 @@
-     if you already have ivy in your ant lib, you can simply remove this
-     target and the dependency the 'go' target has on it
-   ================================= -->
--  <target name="install-ivy" if="with.ivy" depends="download-ivy" description="--> install ivy">
-+  <target name="install-ivy" if="with.ivy" description="--> install ivy">
-     <!-- try to load ivy here from local ivy dir, in case the user has not already dropped
-     it into ant's lib dir (note that the latter copy will always take precedence).
-     We will not fail as long as local lib dir exists (it may be empty) and
diff --git a/ant-antunit.spec b/ant-antunit.spec
index 75fef3f..5493984 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -1,188 +1,184 @@
-%global base_name       antunit
-
-Name:           ant-%{base_name}
-Version:        1.4
-Release:        3%{?dist}
-Summary:        Provide antunit ant task
+Name:           ant-antunit
+Version:        1.4.1
+Release:        2%{?dist}
+Summary:        Unit Test Framework for Ant Tasks
 License:        ASL 2.0
-URL:            http://ant.apache.org/antlibs/%{base_name}/
-Source0:        http://www.apache.org/dist/ant/antlibs/%{base_name}/source/apache-%{name}-%{version}-src.tar.bz2
-# Do not download ivy
-Patch0:         ant-antunit-local.patch
+URL:            https://ant.apache.org/antlibs/antunit
 BuildArch:      noarch
 
-BuildRequires:  javapackages-local
-BuildRequires:  ant
-BuildRequires:  ant-junit
-BuildRequires:  ant-testutil
-BuildRequires:  ivy-local
+Source0:        https://archive.apache.org/dist/ant/antlibs/antunit/source/apache-%{name}-%{version}-src.tar.bz2
+Source1:        https://archive.apache.org/dist/ant/antlibs/antunit/source/apache-%{name}-%{version}-src.tar.bz2.asc
+Source2:        https://archive.apache.org/dist/ant/KEYS
 
+BuildRequires:  gnupg2
+BuildRequires:  maven-local
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.ant:ant)
+BuildRequires:  mvn(org.apache.ant:ant-testutil)
 
 %description
-The <antunit> task drives the tests much like <junit> does for JUnit tests.
+This library contains tasks that enables Ant task developers to test their tasks
+with Ant and without JUnit.  It contains a few assertion tasks and an antunit
+task that runs build files instead of test classes and is modelled after the
+JUnit task.
 
-When called on a build file, the task will start a new Ant project for that
-build file and scan for targets with names that start with "test". For each
-such target it then will:
+%{?javadoc_package}
 
-   1. Execute the target named setUp, if there is one.
-   2. Execute the target itself - if this target depends on other targets the
-      normal Ant rules apply and the dependent targets are executed first.
-   3. Execute the target names tearDown, if there is one.
+%prep
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 
+%autosetup -n apache-%{name}-%{version}
 
-%package javadoc
-Summary:       Javadoc for %{name}
+find -type f '(' -iname '*.jar' -o -iname '*.class' ')' -print -delete
 
-%description javadoc
-This package contains the API documentation for %{name}.
+mv %{name}-%{version}.pom pom.xml
 
+%pom_xpath_inject pom:project/pom:build '
+    <resources>
+      <resource>
+        <directory>${project.basedir}/src/main</directory>
+        <includes>
+          <include>**/antlib.xml</include>
+        </includes>
+      </resource>
+    </resources>'
 
-%prep
-%autosetup -p1 -n apache-%{name}-%{version}
-cat > build.properties <<EOF
-javac.-source=6
-javac.-target=1.6
-javac.test-source=6
-javac.test-target=1.6
-EOF
-mkdir ivy
-build-jar-repository -p ivy ivy
-mv CONTRIBUTORS CONTRIBUTORS.orig
-iconv -f ISO-8859-1 -t UTF-8 CONTRIBUTORS.orig > CONTRIBUTORS
-touch -r CONTRIBUTORS.orig CONTRIBUTORS
+# EatYourOwnDogFoodTest
+sed -i 's|build/test-classes|target/test-classes|g' src/etc/testcases/antunit/java-io.xml
 
+# AssertTest
+sed -i 's|build/classes|target/classes|g' src/etc/testcases/assert.xml src/tests/junit/org/apache/ant/antunit/AssertTest.java
 
 %build
-ant -Divy.mode=local package
-
-
-%install
-%mvn_artifact %{name}-%{version}.pom build/lib/%{name}-%{version}.jar
-%mvn_file ":ant-antunit" ant/ant-antunit
-%mvn_install -J docs/
+%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
 
-# OPT_JAR_LIST fragments
-mkdir -p %{buildroot}%{_sysconfdir}/ant.d
-echo "ant/%{name}" > %{buildroot}%{_sysconfdir}/ant.d/%{base_name}
+%check
+# enable tests
+%pom_xpath_set pom:maven.test.skip false
 
+# compile tests
+xmvn test-compile -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
 
-%check
-# Not resolving local antunit at the moment
-ant -Divy.mode=local -lib build/lib test || :
+# run tests
+java -cp target/classes:target/test-classes:$(build-classpath junit hamcrest ant/ant-testutil ant ant/ant-launcher) \
+       org.junit.runner.JUnitCore \
+       $(find src/tests/junit/ -name '*.java' -printf '%%P\n' | cut -f 1 -d '.' | tr / .)
 
+%install
+%mvn_install
 
 %files -f .mfiles
 %license common/LICENSE NOTICE
-%doc CONTRIBUTORS README README.html WHATSNEW
-%config(noreplace) %{_sysconfdir}/ant.d/%{base_name}
 
-%files javadoc -f .mfiles-javadoc
-%license common/LICENSE NOTICE
+%changelog
+* Mon Dec 13 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 1.4.1-2
+- Swap the order of autosetup and gpgverify
+- Enable tests
 
+* Thu Sep 16 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 1.4.1-1
+- Rebuild with new spec
 
-%changelog
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
+ 
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
+ 
 * Sun Jul 12 2020 Orion Poplawski <orion@nwra.com> - 1.4-1
 - Update to 1.4
-
+ 
 * Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1.3-14
 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
+ 
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
+ 
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
+ 
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
+ 
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
+ 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
+ 
 * Wed Aug 23 2017 Mat Booth <mat.booth@redhat.com> - 1.3-8
 - Fix failure to build from source
-
+ 
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
+ 
 * Tue Mar 28 2017 Orion Poplawski <orion@cora.nwra.com> 1.3-6
 - BR ant
-
+ 
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
+ 
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
+ 
 * Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
+ 
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
+ 
 * Thu May 22 2014 Orion Poplawski <orion@cora.nwra.com> 1.3-1
 - Update to 1.3
-
+ 
 * Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.2-13
 - Use Requires: java-headless rebuild (#1067528)
-
+ 
 * Thu Aug 15 2013 Orion Poplawski <orion@cora.nwra.com> 1.2-12
 - Another attempt at fixing the install
-
+ 
 * Thu Aug 15 2013 Orion Poplawski <orion@cora.nwra.com> 1.2-11
 - Fix install locations (bug 988561)
-
+ 
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
+ 
 * Wed Jul 17 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-9
 - Update to current packaging guidelines
-
+ 
 * Wed Jun 12 2013 Orion Poplawski <orion@cora.nwra.com> 1.2-7
 - Update spec for new Java guidelines
-
+ 
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
+ 
 * Tue Jan 22 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-5
 - Remove ppc64 ExcludeArch
-
+ 
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
+ 
 * Mon Feb 6 2012 Orion Poplawski <orion@cora.nwra.com> 1.2-3
 - Drop junit4 references
-
+ 
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
+ 
 * Wed Jan 4 2012 Orion Poplawski <orion@cora.nwra.com> 1.2-1
 - Update to 1.2
-
+ 
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
+ 
 * Mon Dec 20 2010 Orion Poplawski <orion@cora.nwra.com> 1.1-4
 - ExcludeArch ppc64 - no java >= 1:1.6.0 on ppc64
-
+ 
 * Mon Dec 6 2010 Orion Poplawski <orion@cora.nwra.com> 1.1-3
 - Rename to ant-antunit
 - Drop BuildRoot and %%clean
 - Drop unneeded Provides
-
+ 
 * Fri Oct 29 2010 Orion Poplawski <orion@cora.nwra.com> 1.1-2
 - Add /etc/ant.d/antunit
 - Add Requires: ant
-
+ 
 * Thu Oct 28 2010 Orion Poplawski <orion@cora.nwra.com> 1.1-1
 - Initial package
diff --git a/sources b/sources
index 6a4d403..74b4981 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
-SHA512 (apache-ant-antunit-1.4-src.tar.bz2) = 28cb7a0f740550478f350061cf52596edfdcaa9803a7db1304d43c164d123757e205510893e225cc049e6e10d4af44cf21aa287628205ef6fcf727110def6e04
+SHA512 (apache-ant-antunit-1.4.1-src.tar.bz2) = 7c59f0e918f5ec8edbf10bdbcdca1c9bd2ba2a7b27ade69aa4ca92c0c058c434be517799ce795309c0f1c00726a1c77650101b0d1cbe189db5379b15d29ad305
+SHA512 (KEYS) = 53e72e51fbde88d5b427067b86c10e08aa8013ecdf71f20a53b74902449d7a0a3d56326f11dccfcc06fe195221adc1440d05df5abde6b503b3b55a9f7a95710d
+SHA512 (apache-ant-antunit-1.4.1-src.tar.bz2.asc) = 3ad2cca4240e2714d7c435828b3a3d3cbe1e57647400237ce2a96a714d877605199ccf54a2266ff35081ed9f3e23ca46306b30293c1981e55ccbbc61591ad760