Merge remote-tracking branch 'qubesos/pr/54'

* qubesos/pr/54: Add support for python34-sphinx: package is provided in Qubes repository
QubesOS · Feb 26, 2018 · aea2dc0 · aea2dc0
2 parents fceb7ff + 3b8fec9
commit aea2dc0
Showing 1 changed file with 1 addition and 11 deletions.
diff --git 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,27 +69,17 @@ 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
 %make_install PYTHON=%{__python2}
 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