From b318657e5bae22c3c0c6ae55e04c276eb5e05d9f Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Wed, 21 Sep 2016 17:46:32 +0200
Subject: [PATCH] Update to upstream version 2.5

---
 .gitignore             |  1 +
 apache-commons-io.spec | 26 ++++++++++++++------------
 sources                |  2 +-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9995ce7..d456d29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ commons-io-2.1-src.tar.gz
 /commons-io-2.2-src.tar.gz
 /commons-io-2.3-src.tar.gz
 /commons-io-2.4-src.tar.gz
+/commons-io-2.5-src.tar.gz
diff --git a/apache-commons-io.spec b/apache-commons-io.spec
index 59a952c..cd4e2d9 100644
--- a/apache-commons-io.spec
+++ b/apache-commons-io.spec
@@ -1,19 +1,17 @@
-%global base_name       io
-%global short_name      commons-%{base_name}
-
-Name:           apache-%{short_name}
-Version:        2.4
-Release:        15%{?dist}
+Name:           apache-commons-io
+Version:        2.5
+Release:        1%{?dist}
 Epoch:          1
 Summary:        Utilities to assist with developing IO functionality
 License:        ASL 2.0
-URL:            http://commons.apache.org/%{base_name}
-Source0:        http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+URL:            http://commons.apache.org/io
+Source0:        http://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz
 BuildArch:      noarch
 
-BuildRequires:  java-devel >= 1:1.6
 BuildRequires:  maven-local
-BuildRequires:  apache-commons-parent
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.commons:commons-parent:pom:)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
 
 %description
 Commons-IO contains utility classes, stream implementations,
@@ -27,12 +25,13 @@ Summary:        API documentation for %{name}
 This package provides %{summary}.
 
 %prep
-%setup -q -n %{short_name}-%{version}-src
+%setup -q -n commons-io-%{version}-src
 sed -i 's/\r//' *.txt
 
 %build
-%mvn_file  : %{short_name} %{name}
+%mvn_file  : commons-io %{name}
 %mvn_alias : org.apache.commons:
+
 %mvn_build
 
 %install
@@ -45,6 +44,9 @@ sed -i 's/\r//' *.txt
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Thu Jun 23 2016 Michael Simacek <msimacek@redhat.com> - 1:2.5-1
+- Update to upstream version 2.5
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.4-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index 6d23d57..43bb49f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a3e251952d75991fc8df40ad6b605094  commons-io-2.4-src.tar.gz
+67ce68ad2b617a92f90c8a8242a4b93b  commons-io-2.5-src.tar.gz