Qubes/core-admin-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* qubesos/pr/54:
  Add support for python34-sphinx: package is provided in Qubes repository
This commit is contained in:
Marek Marczykowski-Górecki 2018-02-26 03:39:51 +01:00
commit aea2dc0790
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rpm_spec/qubes-core-admin-client.spec
View File

@ -12,7 +12,7 @@ BuildRequires: python2-devel
%if 0%{?rhel} >= 7 %if 0%{?rhel} >= 7
BuildRequires: python34-setuptools BuildRequires: python34-setuptools
BuildRequires: python34-devel BuildRequires: python34-devel
BuildRequires: python-sphinx BuildRequires: python34-sphinx
BuildRequires: python34-dbus BuildRequires: python34-dbus
Requires: python34-qubesadmin Requires: python34-qubesadmin
%else %else
@ -69,11 +69,7 @@ Python3 module qubesadmin.
%build %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 make -C doc PYTHON=%{__python3} SPHINXBUILD=sphinx-build-%{python3_version} man
%endif
%install %install
rm -rf build rm -rf build
@ -81,15 +77,9 @@ rm -rf build
rm -rf build rm -rf build
%make_install PYTHON=%{__python3} %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 \ make -C doc DESTDIR=$RPM_BUILD_ROOT \
PYTHON=%{__python3} SPHINXBUILD=sphinx-build-%{python3_version} \ PYTHON=%{__python3} SPHINXBUILD=sphinx-build-%{python3_version} \
install install
%endif
%files %files