From 3b8fec933ade8c26cbdcce5e3ac062e25ad57978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret?= Date: Thu, 26 Oct 2017 17:01:05 +0200 Subject: [PATCH] Add support for python34-sphinx: package is provided in Qubes repository --- rpm_spec/qubes-core-admin-client.spec | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/rpm_spec/qubes-core-admin-client.spec b/rpm_spec/qubes-core-admin-client.spec index a249cb3..578d5bb 100644 --- a/rpm_spec/qubes-core-admin-client.spec +++ b/rpm_spec/qubes-core-admin-client.spec @@ -12,7 +12,7 @@ BuildRequires: python2-devel %if 0%{?rhel} >= 7 BuildRequires: python34-setuptools BuildRequires: python34-devel -BuildRequires: python-sphinx +BuildRequires: python34-sphinx BuildRequires: python34-dbus Requires: python34-qubesadmin %else @@ -69,11 +69,7 @@ Python3 module qubesadmin. %build -%if 0%{?rhel} >= 7 -make -C doc PYTHON=%{__python3} SPHINXBUILD=sphinx-build man -%else make -C doc PYTHON=%{__python3} SPHINXBUILD=sphinx-build-%{python3_version} man -%endif %install rm -rf build @@ -81,15 +77,9 @@ rm -rf build rm -rf build %make_install PYTHON=%{__python3} -%if 0%{?rhel} >= 7 -make -C doc DESTDIR=$RPM_BUILD_ROOT \ - PYTHON=%{__python3} SPHINXBUILD=sphinx-build \ - install -%else make -C doc DESTDIR=$RPM_BUILD_ROOT \ PYTHON=%{__python3} SPHINXBUILD=sphinx-build-%{python3_version} \ install -%endif %files