From de0480954919f2d959239cfc735a3c1a97bcba6f2923a2f353feea420ce512d5 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 10 Dec 2018 10:50:09 +0000 Subject: [PATCH] Accepting request 656793 from home:mcepl:branches:devel:languages:python - Because of cyclical dependencies between six and Sphinx, we need to to do multibuild. OBS-URL: https://build.opensuse.org/request/show/656793 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-six?expand=0&rev=62 --- python-six.changes | 2 ++ python-six.spec | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/python-six.changes b/python-six.changes index a03c2ad..ce70bc0 100644 --- a/python-six.changes +++ b/python-six.changes @@ -6,6 +6,8 @@ Mon Dec 10 09:20:52 CET 2018 - mcepl@suse.com original class. * Add `six.ensure_binary`, `six.ensure_text`, and `six.ensure_str`. +- Because of cyclical dependencies between six and Sphinx, we + need to to do multibuild. ------------------------------------------------------------------- Mon Sep 3 15:37:13 UTC 2018 - Hans-Peter Jansen diff --git a/python-six.spec b/python-six.spec index d0a636d..90e519c 100644 --- a/python-six.spec +++ b/python-six.spec @@ -38,8 +38,10 @@ 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 base} +BuildRequires: fdupes BuildRequires: python-rpm-macros +BuildRequires: python2 +BuildRequires: python3 %if %{with test} BuildRequires: %{python_module pytest} BuildRequires: %{python_module py} @@ -60,7 +62,7 @@ Provides: %{python_module six-doc = %{version}} Summary: Documentation files for %name Group: Documentation/HTML -%description +%description -n python-six-doc Six is a Python 2 and 3 compatibility library. It provides utility functions for smoothing over the differences between the Python versions with the goal of writing Python code that is compatible on @@ -82,6 +84,7 @@ cd documentation && make html && rm _build/html/.buildinfo %install %if ! %{with test} %python_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} %endif %check