The package rpms/ant-antunit.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ant-antunit.git/commit/?id=cc476c...
https://src.fedoraproject.org/cgit/rpms/ant-antunit.git/commit/?id=480a91....
Change:
-ExcludeArch: ppc64
+ExcludeArch: ppc64
Thanks.
Full change:
============
commit 21a1ce2e7b6a9c8229f5b0ad3b63920cce0ebefc
Author: Didik Supriadi <didiksupriadi41(a)fedoraproject.org>
Date: Wed Dec 15 19:31:13 2021 +0700
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}...
-# 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}...
+Source1:
https://archive.apache.org/dist/ant/antlibs/antunit/source/apache-%{name}...
+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(a)fedoraproject.org> - 1.4.1-2
+- Swap the order of autosetup and gpgverify
+- Enable tests
+* Thu Sep 16 2021 Didik Supriadi <didiksupriadi41(a)fedoraproject.org> - 1.4.1-1
+- Rebuild with new spec
-%changelog
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.4-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
+
* Mon Jul 27 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.4-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
+
* Sun Jul 12 2020 Orion Poplawski <orion(a)nwra.com> - 1.4-1
- Update to 1.4
-
+
* Fri Jul 10 2020 Jiri Vanek <jvanek(a)redhat.com> - 1.3-14
- Rebuilt for JDK-11, see
https://fedoraproject.org/wiki/Changes/Java11
-
+
* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-13
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
+
* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-12
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
+
* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-11
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
+
* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-10
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-9
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
+
* Wed Aug 23 2017 Mat Booth <mat.booth(a)redhat.com> - 1.3-8
- Fix failure to build from source
-
+
* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-7
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
+
* Tue Mar 28 2017 Orion Poplawski <orion(a)cora.nwra.com> 1.3-6
- BR ant
-
+
* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-5
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
+
* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
+
* Tue Jun 16 2015 Fedora Release Engineering <rel-eng(a)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(a)lists.fedoraproject.org> -
1.3-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
+
* Thu May 22 2014 Orion Poplawski <orion(a)cora.nwra.com> 1.3-1
- Update to 1.3
-
+
* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.2-13
- Use Requires: java-headless rebuild (#1067528)
-
+
* Thu Aug 15 2013 Orion Poplawski <orion(a)cora.nwra.com> 1.2-12
- Another attempt at fixing the install
-
+
* Thu Aug 15 2013 Orion Poplawski <orion(a)cora.nwra.com> 1.2-11
- Fix install locations (bug 988561)
-
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.2-10
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
+
* Wed Jul 17 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.2-9
- Update to current packaging guidelines
-
+
* Wed Jun 12 2013 Orion Poplawski <orion(a)cora.nwra.com> 1.2-7
- Update spec for new Java guidelines
-
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.2-6
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
+
* Tue Jan 22 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.2-5
- Remove ppc64 ExcludeArch
-
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.2-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
+
* Mon Feb 6 2012 Orion Poplawski <orion(a)cora.nwra.com> 1.2-3
- Drop junit4 references
-
+
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.2-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
+
* Wed Jan 4 2012 Orion Poplawski <orion(a)cora.nwra.com> 1.2-1
- Update to 1.2
-
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.1-5
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
+
* Mon Dec 20 2010 Orion Poplawski <orion(a)cora.nwra.com> 1.1-4
- ExcludeArch ppc64 - no java >= 1:1.6.0 on ppc64
-
+
* Mon Dec 6 2010 Orion Poplawski <orion(a)cora.nwra.com> 1.1-3
- Rename to ant-antunit
- Drop BuildRoot and %%clean
- Drop unneeded Provides
-
+
* Fri Oct 29 2010 Orion Poplawski <orion(a)cora.nwra.com> 1.1-2
- Add /etc/ant.d/antunit
- Add Requires: ant
-
+
* Thu Oct 28 2010 Orion Poplawski <orion(a)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
commit ea9d6207cda9edecf36f82f24d2eb6c956d0b486
Author: Tomas Hrcka <thrcka(a)redhat.com>
Date: Wed Dec 15 12:19:57 2021 +0100
Unretirement
https://pagure.io/releng/issue/10464
Signed-off-by: Tomas Hrcka <thrcka(a)redhat.com>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ed4c755
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/apache-ant-antunit-1.1-src.tar.bz2
+/apache-ant-antunit-1.2-src.tar.bz2
+/apache-ant-antunit-1.3-src.tar.bz2
+/apache-ant-antunit-1.4-src.tar.bz2
diff --git a/ant-antunit-local.patch b/ant-antunit-local.patch
new file mode 100644
index 0000000..4ce5fa8
--- /dev/null
+++ b/ant-antunit-local.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000..75fef3f
--- /dev/null
+++ b/ant-antunit.spec
@@ -0,0 +1,188 @@
+%global base_name antunit
+
+Name: ant-%{base_name}
+Version: 1.4
+Release: 3%{?dist}
+Summary: Provide antunit ant task
+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}...
+# Do not download ivy
+Patch0: ant-antunit-local.patch
+BuildArch: noarch
+
+BuildRequires: javapackages-local
+BuildRequires: ant
+BuildRequires: ant-junit
+BuildRequires: ant-testutil
+BuildRequires: ivy-local
+
+
+%description
+The <antunit> task drives the tests much like <junit> does for JUnit tests.
+
+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:
+
+ 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.
+
+
+%package javadoc
+Summary: Javadoc for %{name}
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
+
+%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
+
+
+%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/
+
+# OPT_JAR_LIST fragments
+mkdir -p %{buildroot}%{_sysconfdir}/ant.d
+echo "ant/%{name}" > %{buildroot}%{_sysconfdir}/ant.d/%{base_name}
+
+
+%check
+# Not resolving local antunit at the moment
+ant -Divy.mode=local -lib build/lib test || :
+
+
+%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
+* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.4-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.4-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sun Jul 12 2020 Orion Poplawski <orion(a)nwra.com> - 1.4-1
+- Update to 1.4
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek(a)redhat.com> - 1.3-14
+- Rebuilt for JDK-11, see
https://fedoraproject.org/wiki/Changes/Java11
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-13
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-12
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-11
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-10
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-9
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Aug 23 2017 Mat Booth <mat.booth(a)redhat.com> - 1.3-8
+- Fix failure to build from source
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-7
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Mar 28 2017 Orion Poplawski <orion(a)cora.nwra.com> 1.3-6
+- BR ant
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-5
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Tue Jun 16 2015 Fedora Release Engineering <rel-eng(a)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(a)lists.fedoraproject.org> -
1.3-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Thu May 22 2014 Orion Poplawski <orion(a)cora.nwra.com> 1.3-1
+- Update to 1.3
+
+* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.2-13
+- Use Requires: java-headless rebuild (#1067528)
+
+* Thu Aug 15 2013 Orion Poplawski <orion(a)cora.nwra.com> 1.2-12
+- Another attempt at fixing the install
+
+* Thu Aug 15 2013 Orion Poplawski <orion(a)cora.nwra.com> 1.2-11
+- Fix install locations (bug 988561)
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.2-10
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed Jul 17 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.2-9
+- Update to current packaging guidelines
+
+* Wed Jun 12 2013 Orion Poplawski <orion(a)cora.nwra.com> 1.2-7
+- Update spec for new Java guidelines
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.2-6
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Tue Jan 22 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.2-5
+- Remove ppc64 ExcludeArch
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.2-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Mon Feb 6 2012 Orion Poplawski <orion(a)cora.nwra.com> 1.2-3
+- Drop junit4 references
+
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.2-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Wed Jan 4 2012 Orion Poplawski <orion(a)cora.nwra.com> 1.2-1
+- Update to 1.2
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.1-5
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Dec 20 2010 Orion Poplawski <orion(a)cora.nwra.com> 1.1-4
+- ExcludeArch ppc64 - no java >= 1:1.6.0 on ppc64
+
+* Mon Dec 6 2010 Orion Poplawski <orion(a)cora.nwra.com> 1.1-3
+- Rename to ant-antunit
+- Drop BuildRoot and %%clean
+- Drop unneeded Provides
+
+* Fri Oct 29 2010 Orion Poplawski <orion(a)cora.nwra.com> 1.1-2
+- Add /etc/ant.d/antunit
+- Add Requires: ant
+
+* Thu Oct 28 2010 Orion Poplawski <orion(a)cora.nwra.com> 1.1-1
+- Initial package
diff --git a/dead.package b/dead.package
deleted file mode 100644
index 5204a84..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-Orphaned for 6+ weeks
diff --git a/sources b/sources
new file mode 100644
index 0000000..6a4d403
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (apache-ant-antunit-1.4-src.tar.bz2) =
28cb7a0f740550478f350061cf52596edfdcaa9803a7db1304d43c164d123757e205510893e225cc049e6e10d4af44cf21aa287628205ef6fcf727110def6e04
commit 1e89b1a386f4beb1c36c547ad8b4049ef289503a
Author: Miro HronĨok <miro(a)hroncok.cz>
Date: Thu Jul 1 16:31:28 2021 +0200
Orphaned for 6+ weeks
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index ed4c755..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/apache-ant-antunit-1.1-src.tar.bz2
-/apache-ant-antunit-1.2-src.tar.bz2
-/apache-ant-antunit-1.3-src.tar.bz2
-/apache-ant-antunit-1.4-src.tar.bz2
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
deleted file mode 100644
index 75fef3f..0000000
--- a/ant-antunit.spec
+++ /dev/null
@@ -1,188 +0,0 @@
-%global base_name antunit
-
-Name: ant-%{base_name}
-Version: 1.4
-Release: 3%{?dist}
-Summary: Provide antunit ant task
-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}...
-# Do not download ivy
-Patch0: ant-antunit-local.patch
-BuildArch: noarch
-
-BuildRequires: javapackages-local
-BuildRequires: ant
-BuildRequires: ant-junit
-BuildRequires: ant-testutil
-BuildRequires: ivy-local
-
-
-%description
-The <antunit> task drives the tests much like <junit> does for JUnit tests.
-
-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:
-
- 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.
-
-
-%package javadoc
-Summary: Javadoc for %{name}
-
-%description javadoc
-This package contains the API documentation for %{name}.
-
-
-%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
-
-
-%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/
-
-# OPT_JAR_LIST fragments
-mkdir -p %{buildroot}%{_sysconfdir}/ant.d
-echo "ant/%{name}" > %{buildroot}%{_sysconfdir}/ant.d/%{base_name}
-
-
-%check
-# Not resolving local antunit at the moment
-ant -Divy.mode=local -lib build/lib test || :
-
-
-%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
-* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.4-3
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.4-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sun Jul 12 2020 Orion Poplawski <orion(a)nwra.com> - 1.4-1
-- Update to 1.4
-
-* Fri Jul 10 2020 Jiri Vanek <jvanek(a)redhat.com> - 1.3-14
-- Rebuilt for JDK-11, see
https://fedoraproject.org/wiki/Changes/Java11
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-13
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-12
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-11
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-10
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-9
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Aug 23 2017 Mat Booth <mat.booth(a)redhat.com> - 1.3-8
-- Fix failure to build from source
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-7
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Tue Mar 28 2017 Orion Poplawski <orion(a)cora.nwra.com> 1.3-6
-- BR ant
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-5
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-4
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Tue Jun 16 2015 Fedora Release Engineering <rel-eng(a)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(a)lists.fedoraproject.org> -
1.3-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Thu May 22 2014 Orion Poplawski <orion(a)cora.nwra.com> 1.3-1
-- Update to 1.3
-
-* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.2-13
-- Use Requires: java-headless rebuild (#1067528)
-
-* Thu Aug 15 2013 Orion Poplawski <orion(a)cora.nwra.com> 1.2-12
-- Another attempt at fixing the install
-
-* Thu Aug 15 2013 Orion Poplawski <orion(a)cora.nwra.com> 1.2-11
-- Fix install locations (bug 988561)
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.2-10
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Wed Jul 17 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.2-9
-- Update to current packaging guidelines
-
-* Wed Jun 12 2013 Orion Poplawski <orion(a)cora.nwra.com> 1.2-7
-- Update spec for new Java guidelines
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.2-6
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Tue Jan 22 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.2-5
-- Remove ppc64 ExcludeArch
-
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.2-4
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Mon Feb 6 2012 Orion Poplawski <orion(a)cora.nwra.com> 1.2-3
-- Drop junit4 references
-
-* Thu Jan 12 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.2-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Wed Jan 4 2012 Orion Poplawski <orion(a)cora.nwra.com> 1.2-1
-- Update to 1.2
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.1-5
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Dec 20 2010 Orion Poplawski <orion(a)cora.nwra.com> 1.1-4
-- ExcludeArch ppc64 - no java >= 1:1.6.0 on ppc64
-
-* Mon Dec 6 2010 Orion Poplawski <orion(a)cora.nwra.com> 1.1-3
-- Rename to ant-antunit
-- Drop BuildRoot and %%clean
-- Drop unneeded Provides
-
-* Fri Oct 29 2010 Orion Poplawski <orion(a)cora.nwra.com> 1.1-2
-- Add /etc/ant.d/antunit
-- Add Requires: ant
-
-* Thu Oct 28 2010 Orion Poplawski <orion(a)cora.nwra.com> 1.1-1
-- Initial package
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..5204a84
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Orphaned for 6+ weeks
diff --git a/sources b/sources
deleted file mode 100644
index 6a4d403..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (apache-ant-antunit-1.4-src.tar.bz2) =
28cb7a0f740550478f350061cf52596edfdcaa9803a7db1304d43c164d123757e205510893e225cc049e6e10d4af44cf21aa287628205ef6fcf727110def6e04
commit 94ffcc6badc99d8e5e182c5434c17db22535dc4c
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jan 26 00:09:47 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/ant-antunit.spec b/ant-antunit.spec
index 6dd30a5..75fef3f 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,7 +2,7 @@
Name: ant-%{base_name}
Version: 1.4
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Provide antunit ant task
License: ASL 2.0
URL:
http://ant.apache.org/antlibs/%{base_name}/
@@ -82,6 +82,9 @@ ant -Divy.mode=local -lib build/lib test || :
%changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.4-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Mon Jul 27 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.4-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
commit 1b21a9f38a8333d459a5f35b31a1993aa4083670
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Mon Jul 27 12:05:59 2020 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/ant-antunit.spec b/ant-antunit.spec
index c069468..6dd30a5 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,7 +2,7 @@
Name: ant-%{base_name}
Version: 1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Provide antunit ant task
License: ASL 2.0
URL:
http://ant.apache.org/antlibs/%{base_name}/
@@ -82,6 +82,9 @@ ant -Divy.mode=local -lib build/lib test || :
%changelog
+* Mon Jul 27 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.4-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Sun Jul 12 2020 Orion Poplawski <orion(a)nwra.com> - 1.4-1
- Update to 1.4
commit 14aebd58697d87c825e06273d5356514b804b7be
Author: Orion Poplawski <orion(a)nwra.com>
Date: Mon Jul 13 17:47:08 2020 -0600
Update to 1.4
diff --git a/.gitignore b/.gitignore
index a23e512..ed4c755 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/apache-ant-antunit-1.1-src.tar.bz2
/apache-ant-antunit-1.2-src.tar.bz2
/apache-ant-antunit-1.3-src.tar.bz2
+/apache-ant-antunit-1.4-src.tar.bz2
diff --git a/ant-antunit-local.patch b/ant-antunit-local.patch
new file mode 100644
index 0000000..4ce5fa8
--- /dev/null
+++ b/ant-antunit-local.patch
@@ -0,0 +1,12 @@
+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 d3b993f..c069468 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -1,18 +1,21 @@
%global base_name antunit
-Name: ant-%{base_name}
-Version: 1.3
-Release: 14%{?dist}
-Summary: Provide antunit ant task
-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}...
-BuildArch: noarch
-
-BuildRequires: javapackages-local
-BuildRequires: ant
-BuildRequires: ant-junit
-BuildRequires: ant-testutil
+Name: ant-%{base_name}
+Version: 1.4
+Release: 1%{?dist}
+Summary: Provide antunit ant task
+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}...
+# Do not download ivy
+Patch0: ant-antunit-local.patch
+BuildArch: noarch
+
+BuildRequires: javapackages-local
+BuildRequires: ant
+BuildRequires: ant-junit
+BuildRequires: ant-testutil
+BuildRequires: ivy-local
%description
@@ -29,21 +32,29 @@ such target it then will:
%package javadoc
-Summary: Javadoc for %{name}
+Summary: Javadoc for %{name}
%description javadoc
This package contains the API documentation for %{name}.
%prep
-%setup -q -n apache-%{name}-%{version}
+%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
%build
-ant package
+ant -Divy.mode=local package
%install
@@ -56,16 +67,24 @@ mkdir -p %{buildroot}%{_sysconfdir}/ant.d
echo "ant/%{name}" > %{buildroot}%{_sysconfdir}/ant.d/%{base_name}
+%check
+# Not resolving local antunit at the moment
+ant -Divy.mode=local -lib build/lib test || :
+
+
%files -f .mfiles
-%license LICENSE NOTICE
+%license common/LICENSE NOTICE
%doc CONTRIBUTORS README README.html WHATSNEW
%config(noreplace) %{_sysconfdir}/ant.d/%{base_name}
%files javadoc -f .mfiles-javadoc
-%license LICENSE NOTICE
+%license common/LICENSE NOTICE
%changelog
+* Sun Jul 12 2020 Orion Poplawski <orion(a)nwra.com> - 1.4-1
+- Update to 1.4
+
* Fri Jul 10 2020 Jiri Vanek <jvanek(a)redhat.com> - 1.3-14
- Rebuilt for JDK-11, see
https://fedoraproject.org/wiki/Changes/Java11
diff --git a/sources b/sources
index badfae2..6a4d403 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ae8250c10c7ffdc858145fadc043c6b3 apache-ant-antunit-1.3-src.tar.bz2
+SHA512 (apache-ant-antunit-1.4-src.tar.bz2) =
28cb7a0f740550478f350061cf52596edfdcaa9803a7db1304d43c164d123757e205510893e225cc049e6e10d4af44cf21aa287628205ef6fcf727110def6e04
commit 018a5601d9281055b3ec784621fbc29aa8115415
Author: Jiri <jvanek(a)redhat.com>
Date: Fri Jul 10 14:19:50 2020 +0200
Rebuilt for JDK-11
diff --git a/ant-antunit.spec b/ant-antunit.spec
index 4d7a609..d3b993f 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,7 +2,7 @@
Name: ant-%{base_name}
Version: 1.3
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: Provide antunit ant task
License: ASL 2.0
URL:
http://ant.apache.org/antlibs/%{base_name}/
@@ -66,6 +66,9 @@ echo "ant/%{name}" >
%{buildroot}%{_sysconfdir}/ant.d/%{base_name}
%changelog
+* Fri Jul 10 2020 Jiri Vanek <jvanek(a)redhat.com> - 1.3-14
+- Rebuilt for JDK-11, see
https://fedoraproject.org/wiki/Changes/Java11
+
* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-13
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
commit 14a1159b68cc4d5abfcbbfa32b3dc2de4a990df0
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jan 28 11:38:14 2020 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/ant-antunit.spec b/ant-antunit.spec
index dc1707c..4d7a609 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,7 +2,7 @@
Name: ant-%{base_name}
Version: 1.3
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: Provide antunit ant task
License: ASL 2.0
URL:
http://ant.apache.org/antlibs/%{base_name}/
@@ -66,6 +66,9 @@ echo "ant/%{name}" >
%{buildroot}%{_sysconfdir}/ant.d/%{base_name}
%changelog
+* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-13
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-12
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
commit 46b6f886078687136a3d36e23ef09df8a05faf2a
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 24 17:57:44 2019 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/ant-antunit.spec b/ant-antunit.spec
index e77b214..dc1707c 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,7 +2,7 @@
Name: ant-%{base_name}
Version: 1.3
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Provide antunit ant task
License: ASL 2.0
URL:
http://ant.apache.org/antlibs/%{base_name}/
@@ -66,6 +66,9 @@ echo "ant/%{name}" >
%{buildroot}%{_sysconfdir}/ant.d/%{base_name}
%changelog
+* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-12
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-11
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit 1d9592d5de4af04e0e7990ee90cbd8bf9444c211
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jan 31 13:22:03 2019 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/ant-antunit.spec b/ant-antunit.spec
index c806e48..e77b214 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,7 +2,7 @@
Name: ant-%{base_name}
Version: 1.3
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Provide antunit ant task
License: ASL 2.0
URL:
http://ant.apache.org/antlibs/%{base_name}/
@@ -66,6 +66,9 @@ echo "ant/%{name}" >
%{buildroot}%{_sysconfdir}/ant.d/%{base_name}
%changelog
+* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-11
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-10
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
commit be2d7808a4768254f5bc9582f1442823582948a2
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 12 20:15:33 2018 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/ant-antunit.spec b/ant-antunit.spec
index 1764a68..c806e48 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,7 +2,7 @@
Name: ant-%{base_name}
Version: 1.3
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Provide antunit ant task
License: ASL 2.0
URL:
http://ant.apache.org/antlibs/%{base_name}/
@@ -66,6 +66,9 @@ echo "ant/%{name}" >
%{buildroot}%{_sysconfdir}/ant.d/%{base_name}
%changelog
+* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-10
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-9
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
commit a138b72dc6fcdb6f922c2272986310b261d5b5c0
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Feb 7 02:20:42 2018 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/ant-antunit.spec b/ant-antunit.spec
index 1658525..1764a68 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,7 +2,7 @@
Name: ant-%{base_name}
Version: 1.3
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Provide antunit ant task
License: ASL 2.0
URL:
http://ant.apache.org/antlibs/%{base_name}/
@@ -66,6 +66,9 @@ echo "ant/%{name}" >
%{buildroot}%{_sysconfdir}/ant.d/%{base_name}
%changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-9
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Wed Aug 23 2017 Mat Booth <mat.booth(a)redhat.com> - 1.3-8
- Fix failure to build from source
commit da1b604450ba45ec75fb74bb9343bc9e5fd9ce89
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Wed Aug 23 16:42:37 2017 +0100
Fix failure to build from source
diff --git a/ant-antunit.spec b/ant-antunit.spec
index cd6910a..1658525 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,24 +2,18 @@
Name: ant-%{base_name}
Version: 1.3
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Provide antunit ant task
-Group: Development/Libraries
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}...
BuildArch: noarch
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: jpackage-utils
+BuildRequires: javapackages-local
BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: ant-testutil
-Requires: java-headless >= 1:1.6.0
-Requires: jpackage-utils
-Requires: ant
-
%description
The <antunit> task drives the tests much like <junit> does for JUnit tests.
@@ -53,38 +47,28 @@ ant package
%install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}/ant
-install -pm 644 build/lib/%{name}-%{version}.jar %{buildroot}%{_javadir}/ant/%{name}.jar
-install -d -m 0755 %{buildroot}%{_datadir}/ant/lib
-ln -s ../../java/ant/%{name}.jar %{buildroot}%{_datadir}/ant/lib
-
-# pom
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 %{name}-%{version}.pom %{buildroot}%{_mavenpomdir}/JPP.ant-%{name}.pom
-%add_maven_depmap JPP.ant-%{name}.pom ant/%{name}.jar
-
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr docs/* %{buildroot}%{_javadocdir}/%{name}/
+%mvn_artifact %{name}-%{version}.pom build/lib/%{name}-%{version}.jar
+%mvn_file ":ant-antunit" ant/ant-antunit
+%mvn_install -J docs/
# OPT_JAR_LIST fragments
mkdir -p %{buildroot}%{_sysconfdir}/ant.d
-echo "%{base_name} ant/%{name}" >
%{buildroot}%{_sysconfdir}/ant.d/%{base_name}
+echo "ant/%{name}" > %{buildroot}%{_sysconfdir}/ant.d/%{base_name}
%files -f .mfiles
-%license LICENSE
-%doc CONTRIBUTORS NOTICE README README.html WHATSNEW
+%license LICENSE NOTICE
+%doc CONTRIBUTORS README README.html WHATSNEW
%config(noreplace) %{_sysconfdir}/ant.d/%{base_name}
-%{_datadir}/ant/lib/%{name}.jar
-%files javadoc
-%license LICENSE
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
+%license LICENSE NOTICE
%changelog
+* Wed Aug 23 2017 Mat Booth <mat.booth(a)redhat.com> - 1.3-8
+- Fix failure to build from source
+
* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-7
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
commit 26bd306e895c245f9b4350711e3aa116f250a16a
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 26 02:54:44 2017 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/ant-antunit.spec b/ant-antunit.spec
index c70f3f4..cd6910a 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,7 +2,7 @@
Name: ant-%{base_name}
Version: 1.3
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Provide antunit ant task
Group: Development/Libraries
License: ASL 2.0
@@ -85,6 +85,9 @@ echo "%{base_name} ant/%{name}" >
%{buildroot}%{_sysconfdir}/ant.d/%{base_name}
%changelog
+* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-7
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
* Tue Mar 28 2017 Orion Poplawski <orion(a)cora.nwra.com> 1.3-6
- BR ant
commit f41d1141ae04b65786573528f7ae65b0af43750a
Author: Orion Poplawski <orion(a)cora.nwra.com>
Date: Tue Mar 28 15:53:16 2017 -0600
BR ant
diff --git a/ant-antunit.spec b/ant-antunit.spec
index 9fadacf..c70f3f4 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,7 +2,7 @@
Name: ant-%{base_name}
Version: 1.3
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Provide antunit ant task
Group: Development/Libraries
License: ASL 2.0
@@ -12,6 +12,7 @@ BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
+BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: ant-testutil
@@ -73,16 +74,20 @@ echo "%{base_name} ant/%{name}" >
%{buildroot}%{_sysconfdir}/ant.d/%{base_name}
%files -f .mfiles
-%doc CONTRIBUTORS LICENSE NOTICE README README.html WHATSNEW
+%license LICENSE
+%doc CONTRIBUTORS NOTICE README README.html WHATSNEW
%config(noreplace) %{_sysconfdir}/ant.d/%{base_name}
%{_datadir}/ant/lib/%{name}.jar
%files javadoc
-%doc LICENSE
+%license LICENSE
%{_javadocdir}/%{name}
%changelog
+* Tue Mar 28 2017 Orion Poplawski <orion(a)cora.nwra.com> 1.3-6
+- BR ant
+
* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-5
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
commit 4be62a3428ece068219efe9e5ff8229c4116c58d
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Feb 10 06:00:23 2017 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
diff --git a/ant-antunit.spec b/ant-antunit.spec
index b51ff9d..9fadacf 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,7 +2,7 @@
Name: ant-%{base_name}
Version: 1.3
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Provide antunit ant task
Group: Development/Libraries
License: ASL 2.0
@@ -83,6 +83,9 @@ echo "%{base_name} ant/%{name}" >
%{buildroot}%{_sysconfdir}/ant.d/%{base_name}
%changelog
+* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-5
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
commit ad8bfe1abfb5c3bbcdda0148893eb62c6e9387ae
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Feb 3 16:13:28 2016 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
diff --git a/ant-antunit.spec b/ant-antunit.spec
index 91ad0e9..b51ff9d 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,7 +2,7 @@
Name: ant-%{base_name}
Version: 1.3
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Provide antunit ant task
Group: Development/Libraries
License: ASL 2.0
@@ -83,6 +83,9 @@ echo "%{base_name} ant/%{name}" >
%{buildroot}%{_sysconfdir}/ant.d/%{base_name}
%changelog
+* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
* Tue Jun 16 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.3-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
commit 4ff05fcffbaace4a634f57d1432110b4f9a19275
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Tue Jun 16 23:57:21 2015 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
diff --git a/ant-antunit.spec b/ant-antunit.spec
index 10a931c..91ad0e9 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,7 +2,7 @@
Name: ant-%{base_name}
Version: 1.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Provide antunit ant task
Group: Development/Libraries
License: ASL 2.0
@@ -83,6 +83,9 @@ echo "%{base_name} ant/%{name}" >
%{buildroot}%{_sysconfdir}/ant.d/%{base_name}
%changelog
+* Tue Jun 16 2015 Fedora Release Engineering <rel-eng(a)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(a)lists.fedoraproject.org> -
1.3-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
commit 8fdb868b64e4344d9beeef207ac13d0ee412b407
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Fri Jun 6 19:45:50 2014 -0500
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/ant-antunit.spec b/ant-antunit.spec
index ccb284a..10a931c 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,7 +2,7 @@
Name: ant-%{base_name}
Version: 1.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Provide antunit ant task
Group: Development/Libraries
License: ASL 2.0
@@ -83,6 +83,9 @@ echo "%{base_name} ant/%{name}" >
%{buildroot}%{_sysconfdir}/ant.d/%{base_name}
%changelog
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.3-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
* Thu May 22 2014 Orion Poplawski <orion(a)cora.nwra.com> 1.3-1
- Update to 1.3
commit f2d8c34f03c2a67b4e4f96261bc7c01d176f553f
Author: Orion Poplawski <orion(a)nwra.com>
Date: Thu May 22 13:35:22 2014 -0600
Update to 1.3
diff --git a/.gitignore b/.gitignore
index 6fe18ad..a23e512 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/apache-ant-antunit-1.1-src.tar.bz2
/apache-ant-antunit-1.2-src.tar.bz2
+/apache-ant-antunit-1.3-src.tar.bz2
diff --git a/ant-antunit.spec b/ant-antunit.spec
index 1ba11f1..ccb284a 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -1,8 +1,8 @@
%global base_name antunit
Name: ant-%{base_name}
-Version: 1.2
-Release: 13%{?dist}
+Version: 1.3
+Release: 1%{?dist}
Summary: Provide antunit ant task
Group: Development/Libraries
License: ASL 2.0
@@ -83,6 +83,9 @@ echo "%{base_name} ant/%{name}" >
%{buildroot}%{_sysconfdir}/ant.d/%{base_name}
%changelog
+* Thu May 22 2014 Orion Poplawski <orion(a)cora.nwra.com> 1.3-1
+- Update to 1.3
+
* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.2-13
- Use Requires: java-headless rebuild (#1067528)
diff --git a/sources b/sources
index 109cecc..badfae2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aaf4af619f5325a38cc57f65ef28e3df apache-ant-antunit-1.2-src.tar.bz2
+ae8250c10c7ffdc858145fadc043c6b3 apache-ant-antunit-1.3-src.tar.bz2
commit 8385b4dd778f2e8ae1d27a0f07da202c2a9a1a97
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Mar 4 09:05:46 2014 +0100
Use Requires: java-headless rebuild (#1067528)
diff --git a/ant-antunit.spec b/ant-antunit.spec
index 6724018..1ba11f1 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,7 +2,7 @@
Name: ant-%{base_name}
Version: 1.2
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: Provide antunit ant task
Group: Development/Libraries
License: ASL 2.0
@@ -15,7 +15,7 @@ BuildRequires: jpackage-utils
BuildRequires: ant-junit
BuildRequires: ant-testutil
-Requires: java >= 1:1.6.0
+Requires: java-headless >= 1:1.6.0
Requires: jpackage-utils
Requires: ant
@@ -83,6 +83,9 @@ echo "%{base_name} ant/%{name}" >
%{buildroot}%{_sysconfdir}/ant.d/%{base_name}
%changelog
+* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.2-13
+- Use Requires: java-headless rebuild (#1067528)
+
* Thu Aug 15 2013 Orion Poplawski <orion(a)cora.nwra.com> 1.2-12
- Another attempt at fixing the install
commit dbaea4800704bf2ffa58dc358d7ed1ac707d7cf2
Author: Orion Poplawski <orion(a)nwra.com>
Date: Thu Aug 15 11:56:03 2013 -0600
Another attempt at fixing the install
diff --git a/ant-antunit.spec b/ant-antunit.spec
index cda4a36..6724018 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,7 +2,7 @@
Name: ant-%{base_name}
Version: 1.2
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Provide antunit ant task
Group: Development/Libraries
License: ASL 2.0
@@ -55,6 +55,8 @@ ant package
# jars
install -d -m 0755 %{buildroot}%{_javadir}/ant
install -pm 644 build/lib/%{name}-%{version}.jar %{buildroot}%{_javadir}/ant/%{name}.jar
+install -d -m 0755 %{buildroot}%{_datadir}/ant/lib
+ln -s ../../java/ant/%{name}.jar %{buildroot}%{_datadir}/ant/lib
# pom
install -d -m 755 %{buildroot}%{_mavenpomdir}
@@ -67,12 +69,13 @@ cp -pr docs/* %{buildroot}%{_javadocdir}/%{name}/
# OPT_JAR_LIST fragments
mkdir -p %{buildroot}%{_sysconfdir}/ant.d
-echo "ant/ant-antunit" > %{buildroot}%{_sysconfdir}/ant.d/antunit
+echo "%{base_name} ant/%{name}" >
%{buildroot}%{_sysconfdir}/ant.d/%{base_name}
%files -f .mfiles
%doc CONTRIBUTORS LICENSE NOTICE README README.html WHATSNEW
-%config(noreplace) %{_sysconfdir}/ant.d/antunit
+%config(noreplace) %{_sysconfdir}/ant.d/%{base_name}
+%{_datadir}/ant/lib/%{name}.jar
%files javadoc
%doc LICENSE
@@ -80,6 +83,9 @@ echo "ant/ant-antunit" >
%{buildroot}%{_sysconfdir}/ant.d/antunit
%changelog
+* Thu Aug 15 2013 Orion Poplawski <orion(a)cora.nwra.com> 1.2-12
+- Another attempt at fixing the install
+
* Thu Aug 15 2013 Orion Poplawski <orion(a)cora.nwra.com> 1.2-11
- Fix install locations (bug 988561)
commit 0c9039bad7eaa036e5febefaaff38e5f6a1b572e
Author: Orion Poplawski <orion(a)cora.nwra.com>
Date: Thu Aug 15 08:33:56 2013 -0600
Fix install locations (bug 988561)
diff --git a/ant-antunit.spec b/ant-antunit.spec
index acc7bb9..cda4a36 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,7 +2,7 @@
Name: ant-%{base_name}
Version: 1.2
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Provide antunit ant task
Group: Development/Libraries
License: ASL 2.0
@@ -53,26 +53,26 @@ ant package
%install
# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -pm 644 build/lib/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -d -m 0755 %{buildroot}%{_javadir}/ant
+install -pm 644 build/lib/%{name}-%{version}.jar %{buildroot}%{_javadir}/ant/%{name}.jar
# pom
install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 %{name}-%{version}.pom %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+install -pm 644 %{name}-%{version}.pom %{buildroot}%{_mavenpomdir}/JPP.ant-%{name}.pom
+%add_maven_depmap JPP.ant-%{name}.pom ant/%{name}.jar
# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr docs/* %{buildroot}%{_javadocdir}/%{name}/
# OPT_JAR_LIST fragments
-mkdir -p %{buildroot}%{_sysconfdir}/%{name}.d
-echo "ant/ant-antunit" > %{buildroot}%{_sysconfdir}/%{name}.d/antunit
+mkdir -p %{buildroot}%{_sysconfdir}/ant.d
+echo "ant/ant-antunit" > %{buildroot}%{_sysconfdir}/ant.d/antunit
%files -f .mfiles
%doc CONTRIBUTORS LICENSE NOTICE README README.html WHATSNEW
-%config(noreplace) %{_sysconfdir}/%{name}.d/antunit
+%config(noreplace) %{_sysconfdir}/ant.d/antunit
%files javadoc
%doc LICENSE
@@ -80,6 +80,9 @@ echo "ant/ant-antunit" >
%{buildroot}%{_sysconfdir}/%{name}.d/antunit
%changelog
+* Thu Aug 15 2013 Orion Poplawski <orion(a)cora.nwra.com> 1.2-11
+- Fix install locations (bug 988561)
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.2-10
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
commit c3a0ad5701f3e11277cd5820c29dd9748f3a0c4b
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Fri Aug 2 19:52:00 2013 -0500
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/ant-antunit.spec b/ant-antunit.spec
index b7fedef..acc7bb9 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,7 +2,7 @@
Name: ant-%{base_name}
Version: 1.2
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Provide antunit ant task
Group: Development/Libraries
License: ASL 2.0
@@ -80,6 +80,9 @@ echo "ant/ant-antunit" >
%{buildroot}%{_sysconfdir}/%{name}.d/antunit
%changelog
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.2-10
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
* Wed Jul 17 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.2-9
- Update to current packaging guidelines
commit a2268e7e59872f4d209dd675281ca43a29dd1857
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Jul 17 11:47:25 2013 +0200
Update to current packaging guidelines
diff --git a/ant-antunit.spec b/ant-antunit.spec
index 2e5096f..b7fedef 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,7 +2,7 @@
Name: ant-%{base_name}
Version: 1.2
-Release: 7%{?dist}
+Release: 9%{?dist}
Summary: Provide antunit ant task
Group: Development/Libraries
License: ASL 2.0
@@ -19,9 +19,6 @@ Requires: java >= 1:1.6.0
Requires: jpackage-utils
Requires: ant
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
-
%description
The <antunit> task drives the tests much like <junit> does for JUnit tests.
@@ -38,8 +35,6 @@ such target it then will:
%package javadoc
Summary: Javadoc for %{name}
-Group: Documentation
-Requires: jpackage-utils
%description javadoc
This package contains the API documentation for %{name}.
@@ -85,6 +80,9 @@ echo "ant/ant-antunit" >
%{buildroot}%{_sysconfdir}/%{name}.d/antunit
%changelog
+* Wed Jul 17 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.2-9
+- Update to current packaging guidelines
+
* Wed Jun 12 2013 Orion Poplawski <orion(a)cora.nwra.com> 1.2-7
- Update spec for new Java guidelines
commit 0570da7366ba644cdc8a8496da23911af54f0ea2
Author: Orion Poplawski <orion(a)nwra.com>
Date: Wed Jun 12 11:15:21 2013 -0600
Update spec for new Java guidelines
diff --git a/ant-antunit.spec b/ant-antunit.spec
index 21c2598..2e5096f 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,7 +2,7 @@
Name: ant-%{base_name}
Version: 1.2
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Provide antunit ant task
Group: Development/Libraries
License: ASL 2.0
@@ -57,7 +57,6 @@ ant package
%install
-rm -rf %{buildroot}
# jars
install -d -m 0755 %{buildroot}%{_javadir}
install -pm 644 build/lib/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
@@ -65,7 +64,7 @@ install -pm 644 build/lib/%{name}-%{version}.jar
%{buildroot}%{_javadir}/%{name}
# pom
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 %{name}-%{version}.pom %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap org.apache.ant %{name} %{version} JPP %{name}
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
@@ -76,28 +75,19 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}.d
echo "ant/ant-antunit" > %{buildroot}%{_sysconfdir}/%{name}.d/antunit
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-
-%files
-%defattr(-,root,root,-)
+%files -f .mfiles
%doc CONTRIBUTORS LICENSE NOTICE README README.html WHATSNEW
%config(noreplace) %{_sysconfdir}/%{name}.d/antunit
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
%files javadoc
-%defattr(-,root,root,-)
%doc LICENSE
%{_javadocdir}/%{name}
%changelog
+* Wed Jun 12 2013 Orion Poplawski <orion(a)cora.nwra.com> 1.2-7
+- Update spec for new Java guidelines
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.2-6
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
commit 17a2ae3c9c5b828dc3f56111122b86d565e78da0
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Feb 13 10:34:39 2013 -0600
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/ant-antunit.spec b/ant-antunit.spec
index 50e4723..21c2598 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,7 +2,7 @@
Name: ant-%{base_name}
Version: 1.2
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Provide antunit ant task
Group: Development/Libraries
License: ASL 2.0
@@ -98,6 +98,9 @@ echo "ant/ant-antunit" >
%{buildroot}%{_sysconfdir}/%{name}.d/antunit
%changelog
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.2-6
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
* Tue Jan 22 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.2-5
- Remove ppc64 ExcludeArch
commit cc476c9ad5c4637d5525ef4f92cc7e2906ba1824
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Jan 22 18:05:58 2013 +0100
Remove ppc64 ExcludeArch
ant-antunit builds fine on PPC64:
http://ppc.koji.fedoraproject.org/koji/taskinfo?taskID=876998
diff --git a/ant-antunit.spec b/ant-antunit.spec
index 0e7941a..50e4723 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,14 +2,13 @@
Name: ant-%{base_name}
Version: 1.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Provide antunit ant task
Group: Development/Libraries
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}...
BuildArch: noarch
-ExcludeArch: ppc64
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
@@ -99,6 +98,9 @@ echo "ant/ant-antunit" >
%{buildroot}%{_sysconfdir}/%{name}.d/antunit
%changelog
+* Tue Jan 22 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.2-5
+- Remove ppc64 ExcludeArch
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.2-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
commit 422f32c087d7764a1921f6ad25609c2d7f411e30
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Jul 18 11:03:53 2012 -0500
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/ant-antunit.spec b/ant-antunit.spec
index 9ff1b29..0e7941a 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,7 +2,7 @@
Name: ant-%{base_name}
Version: 1.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Provide antunit ant task
Group: Development/Libraries
License: ASL 2.0
@@ -99,6 +99,9 @@ echo "ant/ant-antunit" >
%{buildroot}%{_sysconfdir}/%{name}.d/antunit
%changelog
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.2-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
* Mon Feb 6 2012 Orion Poplawski <orion(a)cora.nwra.com> 1.2-3
- Drop junit4 references
commit 70f27247e5e43ed2ee72dc12e071fe81142b1539
Merge: 7f15e0e 816265b
Author: Orion Poplawski <orion(a)cora.nwra.com>
Date: Mon Feb 6 14:05:47 2012 -0700
Drop junit4 references
diff --cc ant-antunit.spec
index c10741b,593527d..9ff1b29
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@@ -2,7 -2,7 +2,7 @@@
Name: ant-%{base_name}
Version: 1.2
--Release: 2%{?dist}
++Release: 3%{?dist}
Summary: Provide antunit ant task
Group: Development/Libraries
License: ASL 2.0
@@@ -99,9 -101,9 +99,12 @@@ echo "ant/ant-antunit" > %{buildroot}%{
%changelog
- * Mon Feb 6 2012 Orion Poplawski <orion(a)cora.nwra.com> 1.2-2
++* Mon Feb 6 2012 Orion Poplawski <orion(a)cora.nwra.com> 1.2-3
+- Drop junit4 references
+
+ * Thu Jan 12 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.2-2
+ - Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
* Wed Jan 4 2012 Orion Poplawski <orion(a)cora.nwra.com> 1.2-1
- Update to 1.2
commit 7f15e0efdadf1a94333d407ce7133b8be12a1746
Author: Orion Poplawski <orion(a)cora.nwra.com>
Date: Mon Feb 6 14:05:00 2012 -0700
Drop junit4 references
diff --git a/ant-antunit.spec b/ant-antunit.spec
index 358eed5..c10741b 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,7 +2,7 @@
Name: ant-%{base_name}
Version: 1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Provide antunit ant task
Group: Development/Libraries
License: ASL 2.0
@@ -15,7 +15,6 @@ BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
BuildRequires: ant-junit
BuildRequires: ant-testutil
-BuildRequires: junit4
Requires: java >= 1:1.6.0
Requires: jpackage-utils
@@ -55,7 +54,6 @@ touch -r CONTRIBUTORS.orig CONTRIBUTORS
%build
-export CLASSPATH=`build-classpath junit4`
ant package
@@ -101,6 +99,9 @@ echo "ant/ant-antunit" >
%{buildroot}%{_sysconfdir}/%{name}.d/antunit
%changelog
+* Mon Feb 6 2012 Orion Poplawski <orion(a)cora.nwra.com> 1.2-2
+- Drop junit4 references
+
* Wed Jan 4 2012 Orion Poplawski <orion(a)cora.nwra.com> 1.2-1
- Update to 1.2
commit 816265bbd212237cb3b531c9569562d4836b224f
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Thu Jan 12 15:18:13 2012 -0600
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/ant-antunit.spec b/ant-antunit.spec
index 358eed5..593527d 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,7 +2,7 @@
Name: ant-%{base_name}
Version: 1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Provide antunit ant task
Group: Development/Libraries
License: ASL 2.0
@@ -101,6 +101,9 @@ echo "ant/ant-antunit" >
%{buildroot}%{_sysconfdir}/%{name}.d/antunit
%changelog
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.2-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
* Wed Jan 4 2012 Orion Poplawski <orion(a)cora.nwra.com> 1.2-1
- Update to 1.2
commit 64cb90bba5be68af2da5c0dcc1b08611285d4f39
Author: Orion Poplawski <orion(a)cora.nwra.com>
Date: Thu Jan 5 10:55:28 2012 -0700
Add CLASSPATH for junit4
diff --git a/ant-antunit.spec b/ant-antunit.spec
index aa58ad5..358eed5 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -55,6 +55,7 @@ touch -r CONTRIBUTORS.orig CONTRIBUTORS
%build
+export CLASSPATH=`build-classpath junit4`
ant package
commit 366f327803a399967ae133b7bf254ac5884eaf77
Author: Orion Poplawski <orion(a)cora.nwra.com>
Date: Thu Jan 5 10:42:46 2012 -0700
Add BR ant-junit, ant-testutil, junit4
diff --git a/ant-antunit.spec b/ant-antunit.spec
index d8b691e..aa58ad5 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -13,7 +13,9 @@ ExcludeArch: ppc64
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
-BuildRequires: ant
+BuildRequires: ant-junit
+BuildRequires: ant-testutil
+BuildRequires: junit4
Requires: java >= 1:1.6.0
Requires: jpackage-utils
commit 9e1b7dd21ea3e7936e55404eb938a5225a4da571
Author: Orion Poplawski <orion(a)cora.nwra.com>
Date: Thu Jan 5 09:31:33 2012 -0700
Update to 1.2
diff --git a/.gitignore b/.gitignore
index 6610d54..6fe18ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/apache-ant-antunit-1.1-src.tar.bz2
+/apache-ant-antunit-1.2-src.tar.bz2
diff --git a/ant-antunit.spec b/ant-antunit.spec
index a6956de..d8b691e 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -1,8 +1,8 @@
%global base_name antunit
Name: ant-%{base_name}
-Version: 1.1
-Release: 5%{?dist}
+Version: 1.2
+Release: 1%{?dist}
Summary: Provide antunit ant task
Group: Development/Libraries
License: ASL 2.0
@@ -85,7 +85,7 @@ echo "ant/ant-antunit" >
%{buildroot}%{_sysconfdir}/%{name}.d/antunit
%files
%defattr(-,root,root,-)
-%doc CONTRIBUTORS NOTICE README README.html WHATSNEW common/LICENSE
+%doc CONTRIBUTORS LICENSE NOTICE README README.html WHATSNEW
%config(noreplace) %{_sysconfdir}/%{name}.d/antunit
%{_javadir}/*
%{_mavenpomdir}/*
@@ -93,11 +93,14 @@ echo "ant/ant-antunit" >
%{buildroot}%{_sysconfdir}/%{name}.d/antunit
%files javadoc
%defattr(-,root,root,-)
-%doc common/LICENSE
+%doc LICENSE
%{_javadocdir}/%{name}
%changelog
+* Wed Jan 4 2012 Orion Poplawski <orion(a)cora.nwra.com> 1.2-1
+- Update to 1.2
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.1-5
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index d6ae521..109cecc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a9b3db4333be1f2b45b11917811da5e apache-ant-antunit-1.1-src.tar.bz2
+aaf4af619f5325a38cc57f65ef28e3df apache-ant-antunit-1.2-src.tar.bz2
commit a366db399a297f56abd25bfa7c0c965155ab5cc8
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Mon Feb 7 19:15:42 2011 -0600
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/ant-antunit.spec b/ant-antunit.spec
index b1b24a6..a6956de 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,7 +2,7 @@
Name: ant-%{base_name}
Version: 1.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Provide antunit ant task
Group: Development/Libraries
License: ASL 2.0
@@ -98,6 +98,9 @@ echo "ant/ant-antunit" >
%{buildroot}%{_sysconfdir}/%{name}.d/antunit
%changelog
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.1-5
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Mon Dec 20 2010 Orion Poplawski <orion(a)cora.nwra.com> 1.1-4
- ExcludeArch ppc64 - no java >= 1:1.6.0 on ppc64
commit 480a91d022f8a8bbdb848b75a277de5314260875
Author: Orion Poplawski <orion(a)cora.nwra.com>
Date: Mon Dec 20 10:04:25 2010 -0700
- ExcludeArch ppc64 - no java >= 1:1.6.0 on ppc64
diff --git a/ant-antunit.spec b/ant-antunit.spec
index 818b9ec..b1b24a6 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,13 +2,14 @@
Name: ant-%{base_name}
Version: 1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Provide antunit ant task
Group: Development/Libraries
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}...
BuildArch: noarch
+ExcludeArch: ppc64
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
@@ -97,6 +98,9 @@ echo "ant/ant-antunit" >
%{buildroot}%{_sysconfdir}/%{name}.d/antunit
%changelog
+* Mon Dec 20 2010 Orion Poplawski <orion(a)cora.nwra.com> 1.1-4
+- ExcludeArch ppc64 - no java >= 1:1.6.0 on ppc64
+
* Mon Dec 6 2010 Orion Poplawski <orion(a)cora.nwra.com> 1.1-3
- Rename to ant-antunit
- Drop BuildRoot and %%clean
commit 6e8c95ee24abff327a50b8f901784b33042cf790
Author: Orion Poplawski <orion(a)cora.nwra.com>
Date: Thu Dec 9 08:52:12 2010 -0700
Initial import
diff --git a/.gitignore b/.gitignore
index e69de29..6610d54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/apache-ant-antunit-1.1-src.tar.bz2
diff --git a/ant-antunit.spec b/ant-antunit.spec
new file mode 100644
index 0000000..818b9ec
--- /dev/null
+++ b/ant-antunit.spec
@@ -0,0 +1,110 @@
+%global base_name antunit
+
+Name: ant-%{base_name}
+Version: 1.1
+Release: 3%{?dist}
+Summary: Provide antunit ant task
+Group: Development/Libraries
+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}...
+BuildArch: noarch
+
+BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: jpackage-utils
+BuildRequires: ant
+
+Requires: java >= 1:1.6.0
+Requires: jpackage-utils
+Requires: ant
+
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
+
+
+%description
+The <antunit> task drives the tests much like <junit> does for JUnit tests.
+
+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:
+
+ 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.
+
+
+%package javadoc
+Summary: Javadoc for %{name}
+Group: Documentation
+Requires: jpackage-utils
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
+
+%prep
+%setup -q -n apache-%{name}-%{version}
+mv CONTRIBUTORS CONTRIBUTORS.orig
+iconv -f ISO-8859-1 -t UTF-8 CONTRIBUTORS.orig > CONTRIBUTORS
+touch -r CONTRIBUTORS.orig CONTRIBUTORS
+
+
+%build
+ant package
+
+
+%install
+rm -rf %{buildroot}
+# jars
+install -d -m 0755 %{buildroot}%{_javadir}
+install -pm 644 build/lib/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+
+# pom
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -pm 644 %{name}-%{version}.pom %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_to_maven_depmap org.apache.ant %{name} %{version} JPP %{name}
+
+# javadoc
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr docs/* %{buildroot}%{_javadocdir}/%{name}/
+
+# OPT_JAR_LIST fragments
+mkdir -p %{buildroot}%{_sysconfdir}/%{name}.d
+echo "ant/ant-antunit" > %{buildroot}%{_sysconfdir}/%{name}.d/antunit
+
+
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
+
+%files
+%defattr(-,root,root,-)
+%doc CONTRIBUTORS NOTICE README README.html WHATSNEW common/LICENSE
+%config(noreplace) %{_sysconfdir}/%{name}.d/antunit
+%{_javadir}/*
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
+
+%files javadoc
+%defattr(-,root,root,-)
+%doc common/LICENSE
+%{_javadocdir}/%{name}
+
+
+%changelog
+* Mon Dec 6 2010 Orion Poplawski <orion(a)cora.nwra.com> 1.1-3
+- Rename to ant-antunit
+- Drop BuildRoot and %%clean
+- Drop unneeded Provides
+
+* Fri Oct 29 2010 Orion Poplawski <orion(a)cora.nwra.com> 1.1-2
+- Add /etc/ant.d/antunit
+- Add Requires: ant
+
+* Thu Oct 28 2010 Orion Poplawski <orion(a)cora.nwra.com> 1.1-1
+- Initial package
diff --git a/sources b/sources
index e69de29..d6ae521 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+6a9b3db4333be1f2b45b11917811da5e apache-ant-antunit-1.1-src.tar.bz2