rpms/python-sphinx
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Repurpose the websupport bcond to a sphinxcontrib bcond

Browse Source 
On Fedora, BuildRequire the sphinxcontrib packages to build the documentation.
We don't BR the packages that are orphaned, we anticipate their retirement.
This commit is contained in:
Miro Hrončok 2023-11-16 12:43:10 +01:00
parent 3ae8dffd93
commit 3a7f1fc944
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
python-sphinx.spec
View File

@ -1,7 +1,7 @@
# When bootstrapping sphinx in Fedora, we don't yet have sphinxcontrib-websupport # When bootstrapping sphinx in Fedora, we don't yet have sphinxcontrib-*
# Without it we have warnings in docs, but it's not a hard dependency # Without the packages, we have warnings in docs, but it's not a hard dependency
# We don't want to support sphinxcontrib-websupport in RHEL, hence disabling the dependency # We don't want to support sphinxcontrib-* in RHEL, hence disabling the dependencies
%bcond websupport %{undefined rhel} %bcond sphinxcontrib %{undefined rhel}
# Also, we don't have all the tests requirements # Also, we don't have all the tests requirements
%bcond tests 1 %bcond tests 1
@ -25,7 +25,7 @@ Name: python-sphinx
#global prerel ... #global prerel ...
%global upstream_version %{general_version}%{?prerel} %global upstream_version %{general_version}%{?prerel}
Version: %{general_version}%{?prerel:~%{prerel}} Version: %{general_version}%{?prerel:~%{prerel}}
Release: 2%{?dist} Release: 3%{?dist}
Epoch: 1 Epoch: 1
Summary: Python documentation generator Summary: Python documentation generator
@ -61,7 +61,12 @@ BuildRequires: make
BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: pyproject-rpm-macros BuildRequires: pyproject-rpm-macros
%if %{with websupport} %if %{with sphinxcontrib}
# applehelp and jsmath have been orphaned, we cannot use the [docs] extra directly
BuildRequires: python%{python3_pkgversion}-sphinxcontrib-devhelp
BuildRequires: python%{python3_pkgversion}-sphinxcontrib-htmlhelp
BuildRequires: python%{python3_pkgversion}-sphinxcontrib-serializinghtml
BuildRequires: python%{python3_pkgversion}-sphinxcontrib-qthelp
BuildRequires: python%{python3_pkgversion}-sphinxcontrib-websupport BuildRequires: python%{python3_pkgversion}-sphinxcontrib-websupport
%endif %endif
@ -149,11 +154,9 @@ Recommends: ImageMagick
# Upstream Requires those, but we have a patch to remove the dependency. # Upstream Requires those, but we have a patch to remove the dependency.
# We keep them Recommended to preserve the default user experience. # We keep them Recommended to preserve the default user experience.
# (We don't desire them in RHEL.) %if %{with sphinxcontrib}
%if %{undefined rhel} # applehelp and jsmath have been orphaned
Recommends: python%{python3_pkgversion}-sphinxcontrib-applehelp
Recommends: python%{python3_pkgversion}-sphinxcontrib-devhelp Recommends: python%{python3_pkgversion}-sphinxcontrib-devhelp
Recommends: python%{python3_pkgversion}-sphinxcontrib-jsmath
Recommends: python%{python3_pkgversion}-sphinxcontrib-htmlhelp Recommends: python%{python3_pkgversion}-sphinxcontrib-htmlhelp
Recommends: python%{python3_pkgversion}-sphinxcontrib-serializinghtml Recommends: python%{python3_pkgversion}-sphinxcontrib-serializinghtml
Recommends: python%{python3_pkgversion}-sphinxcontrib-qthelp Recommends: python%{python3_pkgversion}-sphinxcontrib-qthelp
@ -395,6 +398,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib
%changelog %changelog
* Thu Nov 16 2023 Miro Hrončok <mhroncok@redhat.com> - 1:7.2.6-3
- On Fedora, BuildRequire the sphinxcontrib packages to build the documentation
* Wed Nov 08 2023 Miro Hrončok <mhroncok@redhat.com> - 1:7.2.6-2 * Wed Nov 08 2023 Miro Hrončok <mhroncok@redhat.com> - 1:7.2.6-2
- Weaken the runtime dependency on: - Weaken the runtime dependency on:
- python3-sphinxcontrib-applehelp - python3-sphinxcontrib-applehelp