From 05f7115790e5bd70effc4b59aa256037812a845f Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Feb 24 2021 17:13:12 +0000 Subject: Explicitly add used requires, don't require pbr on runtime --- diff --git a/76.patch b/76.patch new file mode 100644 index 0000000..037f8b7 --- /dev/null +++ b/76.patch @@ -0,0 +1,42 @@ +From 32a6039590be17e92dc993247e8ac0af8bb9f8d8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Tue, 23 Feb 2021 00:08:05 +0100 +Subject: [PATCH 1/2] Explicitly add used requires + +- This does not make much sense without click, + the version range comes from tox.ini +- Docutils is a transitive dependency from sphinx, + but this extension currently imports from it directly. +--- + requirements.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/requirements.txt b/requirements.txt +index 6e574d3..14097a8 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,2 +1,4 @@ + pbr>=2.0 + sphinx>=1.5,<4.0 ++click>=6.0,<8.0 ++docutils + +From f3f67499e8d8c42179ebf048a4076180f9a2db12 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Tue, 23 Feb 2021 00:08:40 +0100 +Subject: [PATCH 2/2] Don't require pbr on runtime + +It is only used to build this package. +--- + requirements.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/requirements.txt b/requirements.txt +index 14097a8..ffd4525 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,4 +1,3 @@ +-pbr>=2.0 + sphinx>=1.5,<4.0 + click>=6.0,<8.0 + docutils diff --git a/python-sphinx-click.spec b/python-sphinx-click.spec index 35a296b..25a0b7a 100644 --- a/python-sphinx-click.spec +++ b/python-sphinx-click.spec @@ -2,13 +2,16 @@ Name: python-%{pypi_name} Version: 2.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Sphinx extension that automatically documents Click applications License: MIT -URL: https://github.com/click-contrib/sphinx-click/ +URL: https://github.com/click-contrib/sphinx-click Source0: https://files.pythonhosted.org/packages/source/s/%{pypi_name}/%{pypi_name}-%{version}.tar.gz +# Explicitly add used requires, don't require pbr on runtime +Patch1: %{url}/pull/76.patch + BuildArch: noarch BuildRequires: python3-devel @@ -66,6 +69,10 @@ rm -rf html/.{doctrees,buildinfo} %license LICENSE %changelog +* Wed Feb 24 2021 Miro Hrončok - 2.5.0-3 +- Explicitly add used requires, don't require pbr on runtime +- Fixes: rhbz#1931673 + * Wed Jan 27 2021 Fedora Release Engineering - 2.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild