From 498b7a1f78377bc8a001b83050b391f8e2bb6c1b9909ffcf1d41b347908540da Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Fri, 24 Feb 2017 14:34:14 +0000 Subject: [PATCH] Accepting request 460224 from devel:languages:python:singlespec - update for singlespec - only use python3 version of Sphinx to build docs - provide $flavor-doc for all pythons OBS-URL: https://build.opensuse.org/request/show/460224 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-six?expand=0&rev=47 --- python-six-doc.changes | 6 ++++-- python-six-doc.spec | 9 ++++++--- python-six.spec | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/python-six-doc.changes b/python-six-doc.changes index c75a48d..43e933a 100644 --- a/python-six-doc.changes +++ b/python-six-doc.changes @@ -1,7 +1,9 @@ ------------------------------------------------------------------- -Wed Oct 5 14:34:05 UTC 2016 - jmatejek@suse.com +Thu Feb 23 14:47:06 UTC 2017 - jmatejek@suse.com -- update to run tests against python3 as well +- update for singlespec +- only use python3 version of Sphinx to build docs +- provide $flavor-doc for all pythons ------------------------------------------------------------------- Tue Jan 19 09:07:19 UTC 2016 - toddrme2178@gmail.com diff --git a/python-six-doc.spec b/python-six-doc.spec index 7a2d305..1c24829 100644 --- a/python-six-doc.spec +++ b/python-six-doc.spec @@ -16,7 +16,7 @@ # -%{?!python_module:%define python_module() python-%1 python3-%1} +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-six-doc Version: 1.10.0 Release: 0 @@ -26,14 +26,17 @@ License: MIT Group: Development/Libraries/Python Source: http://pypi.python.org/packages/source/s/six/six-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: %{python_module Sphinx} BuildRequires: %{python_module six} -# Documentation requirements: +# require old python 2 explicitly to get the ssl module +BuildRequires: python +# require only one version of Sphinx for now +BuildRequires: python3-Sphinx # Test requirements: BuildRequires: %{python_module pytest} BuildRequires: %{python_module py} BuildRequires: python-rpm-macros BuildArch: noarch +Provides: %{python_module six-doc = %{version}} %description Six is a Python 2 and 3 compatibility library. It provides utility diff --git a/python-six.spec b/python-six.spec index 20b6a55..7f716de 100644 --- a/python-six.spec +++ b/python-six.spec @@ -16,7 +16,7 @@ # -%{?!python_module:%define python_module() python-%1 python3-%1} +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-six Version: 1.10.0 Release: 0