From b59b0b37b1ce9ba5be805291c7cfe7efa1d60550 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Feb 15 2017 14:30:09 +0000
Subject: Update to upstream version 1.10.1


---

diff --git a/.gitignore b/.gitignore
index e4f1c83..82e8045 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ apache-ant-1.8.4-src.tar.bz2
 /apache-ant-1.9.6-src.tar.bz2
 /apache-ant-1.9.7-src.tar.bz2
 /apache-ant-1.10.0-src.tar.bz2
+/apache-ant-1.10.1-src.tar.bz2
diff --git a/ant.spec b/ant.spec
index e4c5ff2..7ca658c 100644
--- a/ant.spec
+++ b/ant.spec
@@ -35,8 +35,8 @@
 %global major_version 1.9
 
 Name:           ant
-Version:        1.10.0
-Release:        3%{?dist}
+Version:        1.10.1
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Java build tool
 Summary(it):    Tool per la compilazione di programmi java
@@ -58,6 +58,7 @@ BuildRequires:  hamcrest
 BuildRequires:  xalan-j2
 BuildRequires:  xerces-j2
 BuildRequires:  xml-commons-apis
+BuildRequires:  xz-java
 
 # Theoretically Ant might be usable with just JRE, but typical Ant
 # workflow requires full JDK, so we recommend it here.
@@ -312,6 +313,14 @@ Requires:       junit
 %description testutil
 Test utility tasks for %{name}.
 
+%package xz
+Summary:        Optional xz tasks for %{name}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       xz
+
+%description xz
+Optional xz tasks for %{name}.
+
 %package manual
 Summary:        Manual for %{name}
 
@@ -354,7 +363,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 xerces-j2 xml-commons-apis hamcrest/core
+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 xerces-j2 xml-commons-apis hamcrest/core xz-java
 
 # Fix file-not-utf8 rpmlint warning
 iconv KEYS -f iso-8859-1 -t utf-8 -o KEYS.utf8
@@ -366,7 +375,6 @@ mv LICENSE.utf8 LICENSE
 %{ant} jars test-jar
 
 %if %with javadoc
-export CLASSPATH=$(build-classpath antlr bcel javamail/mailapi jdepend junit log4j-1 oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xerces-j2 xml-commons-apis)
 %{ant} javadocs
 %endif
 
@@ -455,6 +463,7 @@ echo "jsch ant/ant-jsch" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jsch
 echo "junit hamcrest/core ant/ant-junit" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit
 echo "junit hamcrest/core ant/ant-junit4" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit4
 echo "testutil ant/ant-testutil" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/testutil
+echo "xz-java ant/ant-xz" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/xz
 
 %if %with javadoc
 # javadoc
@@ -585,6 +594,10 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{ant_home}/lib/%{name}-testutil.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/testutil
 
+%files xz -f .mfiles-xz
+%{ant_home}/lib/%{name}-xz.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/xz
+
 %files manual
 %doc LICENSE NOTICE
 %doc manual/*
@@ -598,6 +611,9 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Feb 15 2017 Michael Simacek <msimacek@redhat.com> - 0:1.10.1-1
+- Update to upstream version 1.10.1
+
 * Fri Feb 10 2017 Michael Simacek <msimacek@redhat.com> - 0:1.10.0-3
 - Use log4j12
 
diff --git a/sources b/sources
index 536c645..19c9aec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (apache-ant-1.10.0-src.tar.bz2) = ec352212fd87da7824206d769418163db122e84e17e1370dae8bb7963bd9a4383febb3a088aebbb901277ce0eb2cf3e92d7fb08d053c4c900c0e9329f72456e2
+SHA512 (apache-ant-1.10.1-src.tar.bz2) = c9987c2e219d9770e0e7250998a201b236d7dd9f78b547cd464142200fde13c81c2bc4f186d3dad7a26324b0019af2dd9e1d60786d2ce1532de3dee30792538e