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

rpm: unify fedora and centos packaging

Browse Source 
Use %{python3_pkgversion} instead of hardcoding python34
This commit is contained in:
Marek Marczykowski-Górecki 2018-12-28 11:53:13 +01:00
parent 9ed922a2f0
commit 78b07aeda7
1 changed files with 13 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
rpm_spec/qubes-core-admin-client.spec.in
View File

@ -9,19 +9,11 @@ URL: https://www.qubes-os.org
BuildRequires: python2-setuptools BuildRequires: python2-setuptools
BuildRequires: python2-devel BuildRequires: python2-devel
%if 0%{?rhel} >= 7 BuildRequires: python%{python3_pkgversion}-setuptools
BuildRequires: python34-setuptools BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python34-devel BuildRequires: python%{python3_pkgversion}-sphinx
BuildRequires: python34-sphinx BuildRequires: python%{python3_pkgversion}-dbus
BuildRequires: python34-dbus Requires: python%{python3_pkgversion}-qubesadmin
Requires: python34-qubesadmin
%else
BuildRequires: python3-setuptools
BuildRequires: python3-devel
BuildRequires: python3-sphinx
BuildRequires: python3-dbus
Requires: python3-qubesadmin
%endif
BuildArch: noarch BuildArch: noarch
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
@ -37,29 +29,20 @@ Requires: python2-lxml
%description -n python2-qubesadmin %description -n python2-qubesadmin
Python2 module qubesadmin. Python2 module qubesadmin.
%package -n python%{python3_pkgversion}-qubesadmin
Summary: Python%{python3_pkgversion} module qubesadmin
%if 0%{?rhel} >= 7 %if 0%{?rhel} >= 7
%package -n python34-qubesadmin
Summary: Python34 module qubesadmin
Requires: python-daemon Requires: python-daemon
Requires: python34-docutils
Requires: python34-lxml
Requires: python34-xcffib
Conflicts: qubes-manager < 4.0.6
%description -n python34-qubesadmin
Python34 module qubesadmin.
%else %else
%package -n python3-qubesadmin
Summary: Python3 module qubesadmin
Requires: python3-daemon Requires: python3-daemon
Requires: python3-docutils %endif
Requires: python3-lxml Requires: python%{python3_pkgversion}-docutils
Requires: python3-xcffib Requires: python%{python3_pkgversion}-lxml
Requires: python%{python3_pkgversion}-xcffib
Conflicts: qubes-manager < 4.0.6 Conflicts: qubes-manager < 4.0.6
%description -n python3-qubesadmin %description -n python%{python3_pkgversion}-qubesadmin
Python3 module qubesadmin. Python3 module qubesadmin.
%endif
%prep %prep
%setup -q %setup -q
@ -93,11 +76,7 @@ make -C doc DESTDIR=$RPM_BUILD_ROOT \
%{python2_sitelib}/qubesadmin-*egg-info %{python2_sitelib}/qubesadmin-*egg-info
%{python2_sitelib}/qubesadmin %{python2_sitelib}/qubesadmin
%if 0%{?rhel} >= 7 %files -n python%{python3_pkgversion}-qubesadmin
%files -n python34-qubesadmin
%else
%files -n python3-qubesadmin
%endif
%{python3_sitelib}/qubesadmin-*egg-info %{python3_sitelib}/qubesadmin-*egg-info
%{python3_sitelib}/qubesadmin %{python3_sitelib}/qubesadmin