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

Add CentOS support and fix python3 dependencies for CentOS (except python3-sphinx and python3-daemon which has no python34 package)

Browse Source
This commit is contained in:
Frédéric Pierret 2017-10-15 18:56:52 +02:00
parent bb02c6f4a9
commit d3ea2845cd
No known key found for this signature in database
GPG Key ID: 1DABC232BE02201E
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,12 +8,20 @@ License: LGPLv2.1+
URL: https://www.qubes-os.org URL: https://www.qubes-os.org
BuildRequires: python2-setuptools BuildRequires: python2-setuptools
BuildRequires: python3-setuptools
BuildRequires: python2-devel BuildRequires: python2-devel
%if 0%{?rhel} >= 7
BuildRequires: python34-setuptools
BuildRequires: python34-devel
BuildRequires: python-sphinx
BuildRequires: python34-dbus
Requires: python34-qubesadmin
%else
BuildRequires: python3-setuptools
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3-sphinx BuildRequires: python3-sphinx
BuildRequires: python3-dbus BuildRequires: python3-dbus
Requires: python3-qubesadmin Requires: python3-qubesadmin
%endif
BuildArch: noarch BuildArch: noarch
%if 0%{?qubes_builder} %if 0%{?qubes_builder}
@ -31,6 +39,16 @@ Requires: python-docutils
%description -n python2-qubesadmin %description -n python2-qubesadmin
Python2 module qubesadmin. Python2 module qubesadmin.
%if 0%{?rhel} >= 7
%package -n python34-qubesadmin
Summary: Python34 module qubesadmin
Requires: python-daemon
Requires: python34-docutils
Conflicts: qubes-manager < 4.0.6
%description -n python34-qubesadmin
Python34 module qubesadmin.
%else
%package -n python3-qubesadmin %package -n python3-qubesadmin
Summary: Python3 module qubesadmin Summary: Python3 module qubesadmin
Requires: python3-daemon Requires: python3-daemon
@ -39,6 +57,7 @@ Conflicts: qubes-manager < 4.0.6
%description -n python3-qubesadmin %description -n python3-qubesadmin
Python3 module qubesadmin. Python3 module qubesadmin.
%endif
%prep %prep
%if !0%{?qubes_builder} %if !0%{?qubes_builder}
@ -47,7 +66,11 @@ 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
@ -55,9 +78,15 @@ 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
@ -73,7 +102,11 @@ make -C doc DESTDIR=$RPM_BUILD_ROOT \
%{python_sitelib}/qubesadmin-*egg-info %{python_sitelib}/qubesadmin-*egg-info
%{python_sitelib}/qubesadmin %{python_sitelib}/qubesadmin
%if 0%{?rhel} >= 7
%files -n python34-qubesadmin
%else
%files -n python3-qubesadmin %files -n python3-qubesadmin
%endif
%{python3_sitelib}/qubesadmin-*egg-info %{python3_sitelib}/qubesadmin-*egg-info
%{python3_sitelib}/qubesadmin %{python3_sitelib}/qubesadmin