From 6f02d5cabef431ef75a96a9b7579c3520ea56ac3 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 5 May 2016 08:41:09 +0200
Subject: [PATCH] Update to upstream version 3.5

---
 .gitignore              |  1 +
 apache-commons-net.spec | 16 ++++++++--------
 sources                 |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 290ba67..ac1fb40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ commons-net-2.0-src.tar.gz
 /commons-net-3.2-src.tar.gz
 /commons-net-3.3-src.tar.gz
 /commons-net-3.4-src.tar.gz
+/commons-net-3.5-src.tar.gz
diff --git a/apache-commons-net.spec b/apache-commons-net.spec
index cbb9537..11f1c04 100644
--- a/apache-commons-net.spec
+++ b/apache-commons-net.spec
@@ -3,8 +3,8 @@
 %global short_name   commons-%{base_name}
 
 Name:           apache-%{short_name}
-Version:        3.4
-Release:        3%{?dist}
+Version:        3.5
+Release:        1%{?dist}
 Summary:        Internet protocol suite Java library
 License:        ASL 2.0
 URL:            http://commons.apache.org/%{base_name}/
@@ -34,15 +34,11 @@ Summary:    API documentation for %{name}
 
 %prep
 %setup -q -n %{short_name}-%{version}-src
-sed -i 's/\r//' NOTICE.txt LICENSE.txt README RELEASE-NOTES.txt
 
 # This test fails with "Connection timed out"
 rm src/test/java/org/apache/commons/net/time/TimeTCPClientTest.java
 # Fails in Koji with "Address already in use"
 rm src/test/java/org/apache/commons/net/tftp/TFTPServerPathTest.java
-# Workaround for suprious test failure (NET-586)
-# Fixed upstream: https://issues.apache.org/jira/browse/NET-586
-sed -i 's/testFeb29IfLeapYear/ignored_&/' $(find -name FTPTimestampParserImplTest.java)
 
 %mvn_file  : %{short_name} %{name}
 %mvn_alias : org.apache.commons:%{short_name}
@@ -55,12 +51,16 @@ sed -i 's/testFeb29IfLeapYear/ignored_&/' $(find -name FTPTimestampParserImplTes
 
 
 %files -f .mfiles
-%doc LICENSE.txt NOTICE.txt README RELEASE-NOTES.txt
+%doc README.md RELEASE-NOTES.txt
+%license LICENSE.txt NOTICE.txt
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt NOTICE.txt
+%license LICENSE.txt NOTICE.txt
 
 %changelog
+* Thu May  5 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.5-1
+- Update to upstream version 3.5
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index b601c44..19971cc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-33a76cdaf133854439fc79750f0ce0c4  commons-net-3.4-src.tar.gz
+eb84d4950c520196ea08eed810541280  commons-net-3.5-src.tar.gz