[packages/python-django] - use sphinx-build-2 for docs (incompatible with Sphinx 4)

qboosh qboosh at pld-linux.org
Mon Apr 25 21:57:29 CEST 2022


commit ab34a6caa0d3e111b796977a0031ffbf7e84cec2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Apr 25 21:57:46 2022 +0200

    - use sphinx-build-2 for docs (incompatible with Sphinx 4)

 python-django.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/python-django.spec b/python-django.spec
index 9befc03..4ef81be 100644
--- a/python-django.spec
+++ b/python-django.spec
@@ -42,7 +42,7 @@ BuildRequires:	python3-pytz
 %endif
 %endif
 %if %{with doc}
-BuildRequires:	sphinx-pdg >= 1.8
+BuildRequires:	sphinx-pdg-2 >= 1.8
 %endif
 Suggests:	python-MySQLdb
 Suggests:	python-PyGreSQL
@@ -115,7 +115,8 @@ PYTHONPATH=$(pwd)/build-3/lib \
 %endif
 
 %if %{with doc}
-%{__make} -C docs html
+%{__make} -C docs html \
+	SPHINXBUILD=sphinx-build-2
 %endif
 
 %install
@@ -143,7 +144,9 @@ ln -s django-admin-3 $RPM_BUILD_ROOT%{_bindir}/py3-django-admin
 
 # setup "django-admin" global alias
 %if %{with python3}
-ln -sf py3-django-admin $RPM_BUILD_ROOT%{_bindir}/django-admin
+ln -sf django-admin-3 $RPM_BUILD_ROOT%{_bindir}/django-admin
+%else
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/django-admin
 %endif
 
 %if %{with doc}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-django.git/commitdiff/ab34a6caa0d3e111b796977a0031ffbf7e84cec2



More information about the pld-cvs-commit mailing list