PR#9: EPEL 8 compat - rpms/python-sphinx

rpms / python-sphinx

#9 EPEL 8 compat

Closed 5 years ago by kanarip. Opened 5 years ago by kanarip.

rpms/ kanarip/python-sphinx epel8 into master

In order to build for epel8, allow sphinx to actually, factually, practically, not require websupport

Jeroen van Meeuwen (Kolab Systems) • 5 years ago

c92a8a9

python-sphinx.spec

file modified

+9 -1

		`@@ -57,6 +57,9 @@`
		`# which causes that test to fail.`
		`Patch1: sphinx-test_theming.diff`

		`+ # Really exclude websupport if so specified`
		`+ Patch2: websupport.patch`
		`+`
		`BuildArch: noarch`
		`BuildRequires: python2-devel >= 2.4`
		`BuildRequires: python2-babel`
		`@@ -395,7 +398,12 @@`
		`This package contains locale files for Sphinx`

		`%prep`
		`- %autosetup -n %{upstream_name}-%{version}%{?prerel} -p1`
		`+ %setup -q -n %{upstream_name}-%{version}%{?prerel}`
		`+ %patch0 -p1`
		`+ %patch1 -p1`
		`+ %if ! %{with websupport}`
		`+ %patch2 -p1`
		`+ %endif`

		`cp %{SOURCE5} .`

websupport.patch

file added

+33

		`@@ -0,0 +1,33 @@`
		`+ diff -ur Sphinx-1.8.4.orig/setup.py Sphinx-1.8.4/setup.py`
		`+ --- Sphinx-1.8.4.orig/setup.py 2019-02-03 15:12:13.000000000 +0100`
		`+ +++ Sphinx-1.8.4/setup.py 2019-03-06 18:53:33.801577031 +0100`
		`+ @@ -27,7 +27,6 @@`
		`+ 'requests>=2.0.0',`
		`+ 'setuptools',`
		`+ 'packaging',`
		`+ - 'sphinxcontrib-websupport',`
		`+ ]`
		`+`
		`+ extras_require = {`
		`+ @@ -38,10 +37,6 @@`
		`+ ':python_version<"3.5"': [`
		`+ 'typing'`
		`+ ],`
		`+ - 'websupport': [`
		`+ - 'sqlalchemy>=0.9',`
		`+ - 'whoosh>=2.0',`
		`+ - ],`
		`+ 'test': [`
		`+ 'mock',`
		`+ 'pytest',`
		`+ diff -ur Sphinx-1.8.4.orig/Sphinx.egg-info/requires.txt Sphinx-1.8.4/Sphinx.egg-info/requires.txt`
		`+ --- Sphinx-1.8.4.orig/Sphinx.egg-info/requires.txt 2019-02-03 15:15:59.000000000 +0100`
		`+ +++ Sphinx-1.8.4/Sphinx.egg-info/requires.txt 2019-03-06 18:40:24.384208948 +0100`
		`+ @@ -9,7 +9,6 @@`
		`+ requests>=2.0.0`
		`+ setuptools`
		`+ packaging`
		`+ -sphinxcontrib-websupport`
		`+`
		`+ [:python_version<"3.5"]`
		`+ typing`

kanarip commented 5 years ago

In order for EPEL 8 bootstrapping, it would be helpful for python{2,3}-sphinx to not depend on -websupport.

This patch allows for the build conditional to strip out websupport from the runtime dependencies, avoiding a loop between -sphinx and, for example, -whoosh.