diff --git a/python-appdirs.changes b/python-appdirs.changes
index 3f12144..ea92737 100644
--- a/python-appdirs.changes
+++ b/python-appdirs.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Tue Sep  4 15:23:26 UTC 2018 - Matěj Cepl <mcepl@suse.com>
+
+- Clean SPEC and remove circular dependency on python-setuptools
+  (Add remove-setuptools-dependency.patch patch to do this)
+
+-------------------------------------------------------------------
+Fri Aug 17 13:47:34 UTC 2018 - tchvatal@suse.com
+
+- Use setuptools normally
+- Run tests
+
+-------------------------------------------------------------------
+Tue Aug 14 10:13:51 UTC 2018 - ms@suse.com
+
+- Submission to SUSE:SLE-12-SP3:Update:PubClouds
+    
+  This commit tracks the submission for fate#326575
+  and bsc#1103542
+
 -------------------------------------------------------------------
 Tue Aug  8 06:11:57 UTC 2017 - tbechtold@suse.com
 
diff --git a/python-appdirs.spec b/python-appdirs.spec
index 2019e16..faddea3 100644
--- a/python-appdirs.spec
+++ b/python-appdirs.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-appdirs
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,11 +23,11 @@ Release:        0
 Summary:        A small Python module for determining platform-specific dirs
 License:        MIT
 Group:          Development/Languages/Python
-Url:            http://github.com/ActiveState/appdirs
+URL:            http://github.com/ActiveState/appdirs
 Source:         https://files.pythonhosted.org/packages/source/a/appdirs/appdirs-%{version}.tar.gz
+Patch:          remove-setuptools-dependency.patch
 BuildRequires:  %{python_module base}
 BuildRequires:  python-rpm-macros
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 %python_subpackages
 
@@ -51,14 +51,13 @@ sed -r -i '1s/^#!.*$//' appdirs.py
 
 %install
 %python_install
-# fix up egg-info because distutils is bad and should feel bad
-%{python_expand rm %{buildroot}%{$python_sitelib}/*.egg-info
-cp -r appdirs.egg-info %{buildroot}%{$python_sitelib}/appdirs-%{version}-py%{$python_version}.egg-info
-}
+
+%check
+%python_exec -munittest discover -v
 
 %files %{python_files}
-%defattr(-,root,root,-)
-%doc CHANGES.rst LICENSE.txt README.rst
+%license LICENSE.txt
+%doc CHANGES.rst README.rst
 %pycache_only %{python_sitelib}/__pycache__/*
 %{python_sitelib}/appdirs.py*
 %{python_sitelib}/appdirs-%{version}-py%{python_version}.egg-info
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',