From e1281e0fdb0b34175160413d532529951042c1470ebb9bbd0368d40aacfe1144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 6 Jun 2019 14:30:44 +0000 Subject: [PATCH] - Generate documentation only with sphinx3 no need to do it twice OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-mysqlclient?expand=0&rev=10 --- python-mysqlclient.changes | 6 ++++++ python-mysqlclient.spec | 12 +++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/python-mysqlclient.changes b/python-mysqlclient.changes index b435cbf..bad462e 100644 --- a/python-mysqlclient.changes +++ b/python-mysqlclient.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 6 14:30:26 UTC 2019 - Tomáš Chvátal + +- Generate documentation only with sphinx3 no need to do it + twice + ------------------------------------------------------------------- Fri Feb 8 23:12:28 UTC 2019 - Alexei Podvalsky diff --git a/python-mysqlclient.spec b/python-mysqlclient.spec index 9fe6b95..aa48dee 100644 --- a/python-mysqlclient.spec +++ b/python-mysqlclient.spec @@ -1,7 +1,7 @@ # # spec file for package python-mysqlclient # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -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/ # @@ -26,12 +26,12 @@ License: GPL-2.0-or-later Group: Development/Languages/Python URL: https://github.com/PyMySQL/mysqlclient-python Source: https://files.pythonhosted.org/packages/source/m/mysqlclient/mysqlclient-%{version}.tar.gz -BuildRequires: %{python_module Sphinx} BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: libmysqlclient-devel BuildRequires: python-rpm-macros +BuildRequires: python3-Sphinx BuildRequires: unzip Recommends: mariadb Provides: python-mysql = %{version} @@ -44,7 +44,6 @@ Obsoletes: %{oldpython}-mysql < %{version} Provides: %{oldpython}-MySQL-python = %{version} Obsoletes: %{oldpython}-MySQL-python < %{version} %endif - %python_subpackages %description @@ -58,8 +57,7 @@ This package adds Python 3 support and bug fixes to MySQLdb1. %build %python_build -%{python_expand $python setup.py build -$python setup.py build_sphinx && rm build/sphinx/html/.buildinfo} +python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo %install %python_install @@ -67,7 +65,7 @@ $python setup.py build_sphinx && rm build/sphinx/html/.buildinfo} %files %{python_files} %license LICENSE -%doc HISTORY.rst MANIFEST.in README.md +%doc HISTORY.rst MANIFEST.in README.md build/sphinx/html %{python_sitearch}/* %changelog