From f9b439035352d986ac6262834a7ae07669dd55a0446ce03f3f5ffed8a460daec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 26 Jul 2019 14:22:16 +0000
Subject: [PATCH] Accepting request 718906 from home:pgajdos

the last one this week

OBS-URL: https://build.opensuse.org/request/show/718906
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-fs?expand=0&rev=18
---
 fs-2.4.5.tar.gz                 |  3 ---
 fs-2.4.8.tar.gz                 |  3 +++
 more-relaxed-requirements.patch | 40 ++++++++++++++++-----------------
 python-fs.changes               | 10 +++++++++
 python-fs.spec                  |  8 +++----
 5 files changed, 36 insertions(+), 28 deletions(-)
 delete mode 100644 fs-2.4.5.tar.gz
 create mode 100644 fs-2.4.8.tar.gz

diff --git a/fs-2.4.5.tar.gz b/fs-2.4.5.tar.gz
deleted file mode 100644
index cab6cff..0000000
--- a/fs-2.4.5.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:42022b74cfa30b1fad4e697720b1bc0eed8c49ca80ed8f5f0bb07d9db41d62bf
-size 124343
diff --git a/fs-2.4.8.tar.gz b/fs-2.4.8.tar.gz
new file mode 100644
index 0000000..d4f9e69
--- /dev/null
+++ b/fs-2.4.8.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5e19251e939b10d50e4b58b0cf2862851794abcf4aa4387b67c69dd61e97b3dc
+size 124808
diff --git a/more-relaxed-requirements.patch b/more-relaxed-requirements.patch
index dd7e298..53c6d3b 100644
--- a/more-relaxed-requirements.patch
+++ b/more-relaxed-requirements.patch
@@ -1,30 +1,28 @@
---- a/setup.py
-+++ b/setup.py
-@@ -21,10 +21,10 @@
+Index: fs-2.4.8/setup.py
+===================================================================
+--- fs-2.4.8.orig/setup.py	2019-07-26 15:56:23.878197898 +0200
++++ fs-2.4.8/setup.py	2019-07-26 15:57:13.178479543 +0200
+@@ -19,7 +19,7 @@ CLASSIFIERS = [
+     "Topic :: System :: Filesystems",
  ]
  
- REQUIREMENTS = [
--    "appdirs~=1.4.3",
-+    "appdirs",
-     "pytz",
-     "setuptools",
--    "six~=1.10",
-+    "six",
- ]
+-REQUIREMENTS = ["appdirs~=1.4.3", "pytz", "setuptools", "six~=1.10"]
++REQUIREMENTS = ["appdirs>=1.4.3", "pytz", "setuptools", "six>=1.10"]
  
  setup(
-@@ -34,10 +34,10 @@
+     author="Will McGugan",
+@@ -28,10 +28,10 @@ setup(
      description="Python's filesystem abstraction layer",
      install_requires=REQUIREMENTS,
      extras_require={
--        "scandir :python_version < '3.5'": ['scandir~=1.5'],
--        ":python_version < '3.4'": ['enum34~=1.1.6'],
--        ":python_version < '3.6'": ['typing~=3.6'],
--        ":python_version < '3.0'": ['backports.os~=0.1']
-+        "scandir :python_version < '3.5'": ['scandir'],
-+        ":python_version < '3.4'": ['enum34'],
-+        ":python_version < '3.6'": ['typing'],
-+        ":python_version < '3.0'": ['backports.os']
+-        "scandir :python_version < '3.5'": ["scandir~=1.5"],
+-        ":python_version < '3.4'": ["enum34~=1.1.6"],
+-        ":python_version < '3.6'": ["typing~=3.6"],
+-        ":python_version < '3.0'": ["backports.os~=0.1"],
++        "scandir :python_version < '3.5'": ["scandir>=1.5"],
++        ":python_version < '3.4'": ["enum34>=1.1.6"],
++        ":python_version < '3.6'": ["typing>=3.6"],
++        ":python_version < '3.0'": ["backports.os>=0.1"],
      },
      license="MIT",
-     name='fs',
+     name="fs",
diff --git a/python-fs.changes b/python-fs.changes
index 8761eb2..7e5e679 100644
--- a/python-fs.changes
+++ b/python-fs.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Jul 26 14:10:13 UTC 2019 - pgajdos@suse.com
+
+- version update to 2.4.8
+  * geturl will return URL with user/password if needed @zmej-serow
+  * Flag to OSFS to disable env var expansion
+  * Implemented geturl in FTPFS @zmej-serow
+- modified patches
+  % more-relaxed-requirements.patch (refreshed)
+
 -------------------------------------------------------------------
 Thu May 16 18:12:13 UTC 2019 - ranand@suse.com
 
diff --git a/python-fs.spec b/python-fs.spec
index ca798f1..453a22e 100644
--- a/python-fs.spec
+++ b/python-fs.spec
@@ -13,13 +13,13 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-fs
-Version:        2.4.5
+Version:        2.4.8
 Release:        0
 Summary:        Python's filesystem abstraction layer
 License:        MIT
@@ -38,9 +38,9 @@ BuildRequires:  %{python_module pytz}
 BuildRequires:  %{python_module scandir >= 1.5}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module six >= 1.10.0}
-BuildRequires:  %{python_module typing}
+BuildRequires:  %{python_module typing >= 3.6}
 BuildRequires:  fdupes
-BuildRequires:  python-backports.os
+BuildRequires:  python-backports.os >= 0.1
 BuildRequires:  python-rpm-macros
 Requires:       python-appdirs >= 1.4.3
 Requires:       python-psutil