summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Styk <mastyk@redhat.com>2019-05-02 10:53:41 +0200
committerMartin Styk <mastyk@redhat.com>2019-05-02 14:09:16 +0200
commitd5f8c17df23479e79291052e2042e92cfe1124b7 (patch)
treed0756c5c722bd9f16c780eadfb27f14ae61bc908
parent3677fd33166e6ed3eb886d4bd6df3b4008f88bbb (diff)
Enable build in RHEL 8
Patch removed unnecessary packages required during RPM build build for Python 3 builds. Change-Id: I5ce49ad2a01ce807635e6b5d2dac68204ba7c9bf Signed-off-by: Martin Styk <mastyk@redhat.com>
-rw-r--r--beaker.spec12
-rw-r--r--documentation/conf.py5
2 files changed, 14 insertions, 3 deletions
diff --git a/beaker.spec b/beaker.spec
index 7ff90b6..ee4be5a 100644
--- a/beaker.spec
+++ b/beaker.spec
@@ -61,7 +61,6 @@ BuildRequires: python3-setuptools
BuildRequires: python3-devel
BuildRequires: python3-docutils
BuildRequires: python3-sphinx
-BuildRequires: python3-sphinxcontrib-httpdomain
%else
%if 0%{?fedora} == 29
BuildRequires: python2-setuptools
@@ -449,6 +448,11 @@ export BKR_PY3=%{with python3}
make
%install
+# RHEL 8 python3-nose removed unversioned executables
+%if 0%{?rhel} >= 8
+ln -sf %{_bindir}/nosetests-%{python3_version} %{buildroot}/nosetests-3
+%endif
+
export BKR_PY3=%{with python3}
DESTDIR=%{buildroot} make install
@@ -459,8 +463,14 @@ ln -s /dev/null %{buildroot}%{_datadir}/bkr/server/assets/site.less
%endif
%check
+%if 0%{?rhel} >= 8
+export PATH=%{buildroot}:$PATH
+%endif
export BKR_PY3=%{with python3}
make check
+%if 0%{?rhel} >= 8
+unlink %{buildroot}/nosetests-3
+%endif
%if %{without python3}
%post server
diff --git a/documentation/conf.py b/documentation/conf.py
index c98e94e..24ac132 100644
--- a/documentation/conf.py
+++ b/documentation/conf.py
@@ -1,7 +1,8 @@
import six
extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'sphinx.ext.todo',
- 'sphinx.ext.extlinks',
- 'sphinxcontrib.httpdomain', 'sphinxcontrib.autohttp.flask']
+ 'sphinx.ext.extlinks']
+if six.PY2:
+ extensions += ['sphinxcontrib.httpdomain', 'sphinxcontrib.autohttp.flask']
master_doc = 'index'
project = u'Beaker'
copyright = u'2013-2019 Red Hat, Inc.'