From 12f728c5ad506299f33f40c544037533da148ce760388994a9501d4821440626 Mon Sep 17 00:00:00 2001
From: Todd R <toddrme2178@gmail.com>
Date: Wed, 9 May 2018 01:35:26 +0000
Subject: [PATCH] Accepting request 605511 from
 home:TheBlackCat:branches:devel:languages:python

- Version update to 1.5.4
  + Enhancements
    * #463: FTPServer class can now be used as a context manager.
  + Bug fixes
    * #431: Ctrl-C doesn't exit `python -m pyftpdlib` on Windows.
    * #436: ThreadedFTPServer.max_cons is evaluated threading.activeCount(). If
      the user uses threads of its own it will consume the number of max_cons.
    * #447: ThreadedFTPServer and MultiprocessFTPServer do not join() tasks which
      are no longer consuming resources.
- Disable tests since they randomly fail.
  See https://github.com/giampaolo/pyftpdlib/issues/386

OBS-URL: https://build.opensuse.org/request/show/605511
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyftpdlib?expand=0&rev=9
---
 pyftpdlib-1.5.3.tar.gz   |  3 ---
 pyftpdlib-1.5.4.tar.gz   |  3 +++
 python-pyftpdlib.changes | 15 +++++++++++++++
 python-pyftpdlib.spec    | 15 +++++++++++++--
 4 files changed, 31 insertions(+), 5 deletions(-)
 delete mode 100644 pyftpdlib-1.5.3.tar.gz
 create mode 100644 pyftpdlib-1.5.4.tar.gz

diff --git a/pyftpdlib-1.5.3.tar.gz b/pyftpdlib-1.5.3.tar.gz
deleted file mode 100644
index 412f2ca..0000000
--- a/pyftpdlib-1.5.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7b9ea701f91bee280c5a930a9c4ceaea91b6d4aaf82b8b8ede82fb84a32081a7
-size 183189
diff --git a/pyftpdlib-1.5.4.tar.gz b/pyftpdlib-1.5.4.tar.gz
new file mode 100644
index 0000000..f9808e3
--- /dev/null
+++ b/pyftpdlib-1.5.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e5fca613978743d41c3bfc68e25a811d646a3b8a9eee9eb07021daca89646a0f
+size 184986
diff --git a/python-pyftpdlib.changes b/python-pyftpdlib.changes
index 54d1c1c..888c07d 100644
--- a/python-pyftpdlib.changes
+++ b/python-pyftpdlib.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed May  9 00:57:35 UTC 2018 - toddrme2178@gmail.com
+
+- Version update to 1.5.4
+  + Enhancements
+    * #463: FTPServer class can now be used as a context manager.
+  + Bug fixes
+    * #431: Ctrl-C doesn't exit `python -m pyftpdlib` on Windows.
+    * #436: ThreadedFTPServer.max_cons is evaluated threading.activeCount(). If
+      the user uses threads of its own it will consume the number of max_cons.
+    * #447: ThreadedFTPServer and MultiprocessFTPServer do not join() tasks which
+      are no longer consuming resources.
+- Disable tests since they randomly fail.
+  See https://github.com/giampaolo/pyftpdlib/issues/386
+
 -------------------------------------------------------------------
 Wed May  2 10:27:38 UTC 2018 - tchvatal@suse.com
 
diff --git a/python-pyftpdlib.spec b/python-pyftpdlib.spec
index 0b53ef3..7c8bb88 100644
--- a/python-pyftpdlib.spec
+++ b/python-pyftpdlib.spec
@@ -18,8 +18,10 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
+# Tests randomly fail: https://github.com/giampaolo/pyftpdlib/issues/386
+%bcond_with     test
 Name:           python-pyftpdlib
-Version:        1.5.3
+Version:        1.5.4
 Release:        0
 Summary:        Asynchronous FTP server library for Python
 License:        MIT
@@ -27,13 +29,20 @@ Group:          Development/Languages/Python
 URL:            https://github.com/giampaolo/pyftpdlib/
 Source:         https://files.pythonhosted.org/packages/source/p/pyftpdlib/pyftpdlib-%{version}.tar.gz
 BuildRequires:  %{python_module devel}
-BuildRequires:  %{python_module mock}
 BuildRequires:  %{python_module nose}
 BuildRequires:  %{python_module pyOpenSSL}
+BuildRequires:  %{python_module psutil}
+BuildRequires:  %{python_module pysendfile}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
+BuildRequires:  python-ipaddress
+BuildRequires:  python-mock
 Requires:       python-pyOpenSSL
+Recommends:     python-pysendfile
+%ifpython2
+Requires:       python-ipaddress
+%endif
 BuildArch:      noarch
 %python_subpackages
 
@@ -51,9 +60,11 @@ write very asynchronous FTP servers with Python.
 %python_install
 %python_expand %fdupes -s %{buildroot}%{$python_sitelib}
 
+%if %{with test}
 %check
 export PYTHONPATH=$PWD
 %python_exec pyftpdlib/test/runner.py
+%endif
 
 %files %{python_files}
 %license LICENSE