From 365150ab9d188392162181e5ed81ca34d4cbed2630ec557ab08f583a6e99839a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 7 Jun 2019 11:56:52 +0000 Subject: [PATCH] - Fix fdupes call - Run py3 only sphinx build as new sphinx does not provide py2 variant anymore OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-rst.linker?expand=0&rev=9 --- python-rst.linker.changes | 7 +++++++ python-rst.linker.spec | 12 +++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/python-rst.linker.changes b/python-rst.linker.changes index 96ad004..7e92153 100644 --- a/python-rst.linker.changes +++ b/python-rst.linker.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jun 7 11:56:25 UTC 2019 - Tomáš Chvátal + +- Fix fdupes call +- Run py3 only sphinx build as new sphinx does not provide py2 + variant anymore + ------------------------------------------------------------------- Wed Feb 27 05:54:37 UTC 2019 - John Vandenberg diff --git a/python-rst.linker.spec b/python-rst.linker.spec index 6ec0a15..26f932f 100644 --- a/python-rst.linker.spec +++ b/python-rst.linker.spec @@ -24,9 +24,8 @@ Release: 0 Summary: Changelog link and timestamp adding Sphinx plugin License: MIT Group: Development/Languages/Python -Url: https://github.com/jaraco/rst.linker +URL: https://github.com/jaraco/rst.linker Source: https://files.pythonhosted.org/packages/source/r/%{_name}/%{_name}-%{version}.tar.gz -BuildRequires: %{python_module Sphinx} BuildRequires: %{python_module jaraco.packaging >= 3.2} BuildRequires: %{python_module path.py} BuildRequires: %{python_module pytest >= 3.5} @@ -36,6 +35,7 @@ BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six} BuildRequires: fdupes BuildRequires: python-rpm-macros +BuildRequires: python3-Sphinx Requires: python-python-dateutil Requires: python-six BuildArch: noarch @@ -51,16 +51,14 @@ sed -i 's/--flake8//' pytest.ini %build %python_build -# Running Sphinx with rst-linker enabled under both Python 2 & 3 is a -# smoketest, and the last Python 3 built version added to doc package -%python_exec setup.py build_sphinx && rm build/sphinx/html/.buildinfo +python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo %install %python_install -%python_expand %fdupes -s %{buildroot}%{$python_sitelib} +%python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%python_exec %{_bindir}/py.test -v test_all.py +%pytest test_all.py %files %{python_files} %license LICENSE