From e2ab314351a8c275cc673746cc56ad17ebde09a1dab2c1677446318ad1b3ae01 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Tue, 4 Sep 2018 16:59:54 +0000
Subject: [PATCH] Accepting request 633053 from home:mcepl:work

- Clean SPEC and remove circular dependency on python-setuptools

OBS-URL: https://build.opensuse.org/request/show/633053
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-appdirs?expand=0&rev=11
---
 python-appdirs.changes             |  5 +++++
 python-appdirs.spec                |  5 +++--
 remove-setuptools-dependency.patch | 22 ++++++++++++++++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 remove-setuptools-dependency.patch

diff --git a/python-appdirs.changes b/python-appdirs.changes
index 062f48d..5df7743 100644
--- a/python-appdirs.changes
+++ b/python-appdirs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep  4 15:23:26 UTC 2018 - Matěj Cepl <mcepl@suse.com>
+
+- Clean SPEC and remove circular dependency on python-setuptools
+
 -------------------------------------------------------------------
 Fri Aug 17 13:47:34 UTC 2018 - tchvatal@suse.com
 
diff --git a/python-appdirs.spec b/python-appdirs.spec
index 9b7b1c7..faddea3 100644
--- a/python-appdirs.spec
+++ b/python-appdirs.spec
@@ -25,7 +25,8 @@ License:        MIT
 Group:          Development/Languages/Python
 URL:            http://github.com/ActiveState/appdirs
 Source:         https://files.pythonhosted.org/packages/source/a/appdirs/appdirs-%{version}.tar.gz
-BuildRequires:  %{python_module setuptools}
+Patch:          remove-setuptools-dependency.patch
+BuildRequires:  %{python_module base}
 BuildRequires:  python-rpm-macros
 BuildArch:      noarch
 %python_subpackages
@@ -52,7 +53,7 @@ sed -r -i '1s/^#!.*$//' appdirs.py
 %python_install
 
 %check
-%python_exec setup.py test
+%python_exec -munittest discover -v
 
 %files %{python_files}
 %license LICENSE.txt
diff --git a/remove-setuptools-dependency.patch b/remove-setuptools-dependency.patch
new file mode 100644
index 0000000..33d2a17
--- /dev/null
+++ b/remove-setuptools-dependency.patch
@@ -0,0 +1,22 @@
+--- a/setup.py
++++ b/setup.py
+@@ -9,10 +9,6 @@ except ImportError:
+     from distutils.core import setup
+ import appdirs
+ 
+-tests_require = []
+-if sys.version_info < (2, 7):
+-    tests_require.append("unittest2")
+-
+ 
+ def read(fname):
+     inf = open(os.path.join(os.path.dirname(__file__), fname))
+@@ -45,8 +41,6 @@ setup(
+         Programming Language :: Python :: Implementation :: CPython
+         Topic :: Software Development :: Libraries :: Python Modules
+         """.split('\n') if c.strip()],
+-    test_suite='test.test_api',
+-    tests_require=tests_require,
+     keywords='application directory log cache user',
+     author='Trent Mick',
+     author_email='trentm@gmail.com',