From 8f792e6e20bae3e7535f3b9fd27764beeec6901f98e272d256428adc962c3629 Mon Sep 17 00:00:00 2001 From: Yuchen Lin Date: Mon, 10 Sep 2018 10:39:00 +0000 Subject: [PATCH] reverting, bsc#1107798 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-appdirs?expand=0&rev=5 --- python-appdirs.changes | 20 -------------------- python-appdirs.spec | 17 +++++++++-------- remove-setuptools-dependency.patch | 22 ---------------------- 3 files changed, 9 insertions(+), 50 deletions(-) delete mode 100644 remove-setuptools-dependency.patch diff --git a/python-appdirs.changes b/python-appdirs.changes index ea92737..3f12144 100644 --- a/python-appdirs.changes +++ b/python-appdirs.changes @@ -1,23 +1,3 @@ -------------------------------------------------------------------- -Tue Sep 4 15:23:26 UTC 2018 - Matěj Cepl - -- 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 faddea3..2019e16 100644 --- a/python-appdirs.spec +++ b/python-appdirs.spec @@ -1,7 +1,7 @@ # # spec file for package python-appdirs # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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,13 +51,14 @@ sed -r -i '1s/^#!.*$//' appdirs.py %install %python_install - -%check -%python_exec -munittest discover -v +# 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 +} %files %{python_files} -%license LICENSE.txt -%doc CHANGES.rst README.rst +%defattr(-,root,root,-) +%doc CHANGES.rst LICENSE.txt 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 deleted file mode 100644 index 33d2a17..0000000 --- a/remove-setuptools-dependency.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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',