From 1b60ebd3ac34e2c4648c4a5377c9e51fc44d658c Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Jun 26 2018 11:24:33 +0000
Subject: Update to upstream version 1.10.4


---

diff --git a/.gitignore b/.gitignore
index 65ad8fb..170d950 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ apache-ant-1.8.4-src.tar.bz2
 /apache-ant-1.10.1-src.tar.bz2
 /apache-ant-1.10.2-src.tar.bz2
 /apache-ant-1.10.3-src.tar.bz2
+/apache-ant-1.10.4-src.tar.bz2
diff --git a/ant.spec b/ant.spec
index 3754882..578dce0 100644
--- a/ant.spec
+++ b/ant.spec
@@ -37,8 +37,8 @@
 %global ant_home %{_datadir}/ant
 
 Name:           ant
-Version:        1.10.3
-Release:        2%{?dist}
+Version:        1.10.4
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Java build tool
 Summary(it):    Tool per la compilazione di programmi java
@@ -68,6 +68,8 @@ BuildRequires:  mvn(oro:oro)
 BuildRequires:  mvn(regexp:regexp)
 BuildRequires:  mvn(xalan:xalan)
 BuildRequires:  mvn(xml-resolver:xml-resolver)
+BuildRequires:  mvn(org.hamcrest:hamcrest-core)
+BuildRequires:  mvn(org.hamcrest:hamcrest-library)
 
 %if %{with junit5}
 BuildRequires:  junit5
@@ -347,7 +349,7 @@ rm src/tests/junit/org/apache/tools/ant/types/selectors/SignedSelectorTest.java 
    src/tests/junit/org/apache/tools/mail/MailMessageTest.java
 
 #install jars
-build-jar-repository -s -p lib/optional antlr bcel javamail/mailapi jdepend junit log4j-1 oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xalan-j2-serializer hamcrest/core xz-java
+build-jar-repository -s -p lib/optional antlr bcel javamail/mailapi jdepend junit log4j-1 oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xalan-j2-serializer hamcrest/core hamcrest/library xz-java
 %if %{with junit5}
 build-jar-repository -s -p lib/optional junit5 opentest4j
 %endif
@@ -625,6 +627,10 @@ LC_ALL=en_US.utf8 %{ant} test
 # -----------------------------------------------------------------------------
 
 %changelog
+* Tue Jun 26 2018 Michael Simacek <msimacek@redhat.com> - 0:1.10.4-1
+- Update to upstream version 1.10.4
+- Resolves: rhbz#1584407
+
 * Wed Apr 18 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.10.3-2
 - Remove legacy Obsoletes/Provides
 
diff --git a/sources b/sources
index 6564ac1..8cb9e23 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (apache-ant-1.10.3-src.tar.bz2) = 0d1b3c72ee34e1ccddd02ad48fa13440618fa76c85166bbbca517b77d61e86b247b82bad819f32cf68d46c5133d98629dc423dfaaf1dd3f1654671eb913b01a5
+SHA512 (apache-ant-1.10.4-src.tar.bz2) = 652e0df4a78c4d4fa2e43c12d86c599e03f770b56a5b15c06af07cd9eab5d1d18d1afcc1ab30b5826a963260c76b8d64cf6c878af47a621d70e618bfa5e30551