From c6c369c6b14e3982b32681de9ff32de03916e372a7da3eb15f9b2462c89a54a0 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 18 Aug 2018 09:13:35 +0000 Subject: [PATCH 1/2] Accepting request 630058 from home:mcepl:work - Break the cycilical dependency on python-setuptools. OBS-URL: https://build.opensuse.org/request/show/630058 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-six?expand=0&rev=58 --- python-six.changes | 5 +++++ python-six.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/python-six.changes b/python-six.changes index 7e69e26..47e699f 100644 --- a/python-six.changes +++ b/python-six.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Aug 18 09:08:38 UTC 2018 - Matěj Cepl + +- Break the cycilical dependency on python-setuptools. + ------------------------------------------------------------------- Fri Aug 10 13:07:30 UTC 2018 - tchvatal@suse.com diff --git a/python-six.spec b/python-six.spec index f336c8d..cb58faa 100644 --- a/python-six.spec +++ b/python-six.spec @@ -25,7 +25,7 @@ License: MIT Group: Development/Libraries/Python URL: http://pypi.python.org/pypi/six/ Source: https://files.pythonhosted.org/packages/source/s/six/six-%{version}.tar.gz -BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module base} BuildRequires: python-rpm-macros BuildArch: noarch %python_subpackages From 8983a2409c7f12426eff5d9cb379c7253768cc62f85c9d2cbea955280f97d064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 3 Sep 2018 18:19:29 +0000 Subject: [PATCH 2/2] Accepting request 632896 from home:frispete:python - remove egg-info directory in %pretrans - fix egg-info directory pattern - match any version of egg-info for a certain python version OBS-URL: https://build.opensuse.org/request/show/632896 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-six?expand=0&rev=59 --- python-six-doc.spec | 2 +- python-six.changes | 7 +++++++ python-six.spec | 8 ++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/python-six-doc.spec b/python-six-doc.spec index 089167f..66126a3 100644 --- a/python-six-doc.spec +++ b/python-six-doc.spec @@ -12,7 +12,7 @@ # 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/ # diff --git a/python-six.changes b/python-six.changes index 47e699f..b324cd0 100644 --- a/python-six.changes +++ b/python-six.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Sep 3 15:37:13 UTC 2018 - Hans-Peter Jansen + +- remove egg-info directory in %pretrans +- fix egg-info directory pattern +- match any version of egg-info for a certain python version + ------------------------------------------------------------------- Sat Aug 18 09:08:38 UTC 2018 - Matěj Cepl diff --git a/python-six.spec b/python-six.spec index cb58faa..ec8945a 100644 --- a/python-six.spec +++ b/python-six.spec @@ -12,7 +12,7 @@ # 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/ # @@ -52,10 +52,10 @@ what is provided. # %check # python test_six.py -%pre +%pretrans # bsc#1057496 - egg-info changed from directory to file -if [ -d %{python_sitelib}/six-%{version}-py%{python_version}.egg-info ]; then - rm -rf %{python_sitelib}/six-%{version}-%{python_version}.egg-info +if [ -d %{python_sitelib}/six-*-py%{python_version}.egg-info ]; then + rm -rf %{python_sitelib}/six-*-py%{python_version}.egg-info fi %files %{python_files}