[packages/python-pygments] - switched doc to python2, so python3 is not involved here - versioned Obsoletes

qboosh qboosh at pld-linux.org
Thu Mar 3 20:52:23 CET 2022


commit 7f2e3221855d316f365e52a4811fc3782016eef4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Mar 3 20:54:19 2022 +0100

    - switched doc to python2, so python3 is not involved here
    - versioned Obsoletes

 python-pygments.spec | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/python-pygments.spec b/python-pygments.spec
index 115f61a..025664b 100644
--- a/python-pygments.spec
+++ b/python-pygments.spec
@@ -1,7 +1,7 @@
 #
 # Conditional build:
 %bcond_without	python2	# CPython 2.x module
-%bcond_without	python3	# CPython 3.x module
+%bcond_with	python3	# CPython 3.x module (built from python3-pygments.spec)
 %bcond_without	doc	# Sphinx documentation
 %bcond_without	tests	# unit tests
 
@@ -17,7 +17,7 @@ Group:		Development/Languages/Python
 Source0:	https://files.pythonhosted.org/packages/source/P/Pygments/Pygments-%{version}.tar.gz
 # Source0-md5:	465a35559863089d959d783a69f79b9f
 Patch0:		rpmspec.patch
-URL:		http://pygments.org/
+URL:		https://pygments.org/
 BuildRequires:	rpmbuild(macros) >= 1.714
 %if %{with python2}
 BuildRequires:	python >= 1:2.7
@@ -38,11 +38,11 @@ BuildRequires:	python3-pytest
 %endif
 %endif
 BuildRequires:	rpm-pythonprov
-%{?with_doc:BuildRequires:	sphinx-pdg}
+%{?with_doc:BuildRequires:	sphinx-pdg-2}
 Requires:	python-modules >= 1:2.7
 Requires:	python-setuptools
 Provides:	python-Pygments = %{version}-%{release}
-Obsoletes:	python-Pygments
+Obsoletes:	python-Pygments < 1.5
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -148,7 +148,8 @@ Dokumentacja API modułu Pythona Pygments.
 
 %if %{with doc}
 PYTHONPATH=$(pwd) \
-%{__make} -C doc html
+%{__make} -C doc html \
+	SPHINXBUILD=sphinx-build-2
 %endif
 
 %install
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-pygments.git/commitdiff/7f2e3221855d316f365e52a4811fc3782016eef4



More information about the pld-cvs-commit mailing list