[ant] Update to upstream 1.9.4.
Alexander Kurtakov
akurtakov at fedoraproject.org
Tue May 6 07:14:15 UTC 2014
commit 605a2b36cf76ae7fbce9599704ee79c111a31bee
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Tue May 6 10:14:33 2014 +0300
Update to upstream 1.9.4.
- Disable tests as they use new junit tas attribute added in this
release.
.gitignore | 1 +
ant.spec | 24 ++++++++++++++----------
sources | 2 +-
3 files changed, 16 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9fed0a4..6cc657c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ apache-ant-1.8.4-src.tar.bz2
/apache-ant-1.9.1-src.tar.bz2
/apache-ant-1.9.2-src.tar.bz2
/apache-ant-1.9.3-src.tar.bz2
+/apache-ant-1.9.4-src.tar.bz2
diff --git a/ant.spec b/ant.spec
index 804bd46..26b4910 100644
--- a/ant.spec
+++ b/ant.spec
@@ -28,23 +28,23 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%bcond_without tests
+%bcond_with tests
%bcond_without javadoc
%global ant_home %{_datadir}/ant
-%global major_version 1.8
+%global major_version 1.9
Name: ant
-Version: 1.9.3
-Release: 2%{?dist}
+Version: 1.9.4
+Release: 1%{?dist}
Epoch: 0
Summary: Build tool for java
Summary(it): Tool per la compilazione di programmi java
Summary(fr): Outil de compilation pour java
License: ASL 2.0
URL: http://ant.apache.org/
-Source0: http://archive.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2
-Source2: apache-ant-%{major_version}.ant.conf
+Source0: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2
+Source2: apache-ant-1.8.ant.conf
# Fix some places where copies of classes are included in the wrong jarfiles
Patch4: apache-ant-class-path-in-manifest.patch
@@ -580,6 +580,10 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# -----------------------------------------------------------------------------
%changelog
+* Tue May 6 2014 Alexander Kurtakov <akurtako at redhat.com> 0:1.9.4-1
+- Update to upstream 1.9.4.
+- Disable tests as they use new junit tas attribute added in this release.
+
* Fri Feb 21 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 0:1.9.3-2
- Skip installation perl and python scripts
@@ -669,7 +673,7 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
* Tue Feb 07 2012 Tomas Radej <tradej at redhat.com> - 0:1.8.2-8
- Removed checking for classpath duplicates
-- Added ant-junit4.jar into %files and ant.d
+- Added ant-junit4.jar into %%files and ant.d
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.8.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
@@ -795,7 +799,7 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
- remove Conflicts
- mark files in %%{_sysconfdir} as %%config(noreplace)
-* Thu Jul 03 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.7.0-2.jpp5
+* Tue Jul 03 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.7.0-2.jpp5
- Add poms and depmap frags
- (B)R jpackage-utils >= 0:1.7.5
- BR java-devel = 0:1.5.0
@@ -833,7 +837,7 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
* Mon Sep 06 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.6.2-2jpp
- Fix to backward compatibility symbolic links.
-* Wed Aug 17 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.6.2-1jpp
+* Tue Aug 17 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.6.2-1jpp
- Update to Ant 1.6.2
* Thu Aug 05 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.6.1-2jpp
@@ -1127,7 +1131,7 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
- changed name to jakarta-ant
- changed group to Development/Java
-* Wed Jan 04 2001 Guillaume Rousse <g.rousse at linux-mandrake.com> 1.2-2mdk
+* Thu Jan 04 2001 Guillaume Rousse <g.rousse at linux-mandrake.com> 1.2-2mdk
- new spec file
- discarded ugly non-free Sun jaxp library from sources, and used pretty open-source xerces instead
diff --git a/sources b/sources
index f4c372d..7911293 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-995f21618acdf35beacc465c84d79534 apache-ant-1.9.3-src.tar.bz2
+7a7253ec047195d755c5318a4de8a3a4 apache-ant-1.9.4-src.tar.bz2
More information about the scm-commits
mailing list