Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rpm: fix python3-* packaging

Browse Source 
Use %{python3_pkgversion} instead of python3-/python34- directly.
Recently CentOS switched to python36-, which made it even more
important.
This commit is contained in:
Marek Marczykowski-Górecki 2019-04-08 17:54:51 +02:00
parent cb55bda8d1
commit f28235df41
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rpm_spec/core-agent.spec.in
View File

@ -138,13 +138,10 @@ Requires: qubes-core-agent-qrexec
Requires: qubes-libvchan
Requires: qubes-db-vm
%if 0%{?fedora} >= 23
Requires: python3-dnf-plugins-qubes-hooks
Requires: python%{python3_pkgversion}-dnf-plugins-qubes-hooks
%else
Requires: python2-dnf-plugins-qubes-hooks
%endif
%if 0%{?rhel} >= 7
Requires: python34-dnf-plugins-qubes-hooks
%endif
Obsoletes: qubes-core-vm-kernel-placeholder <= 1.0
Obsoletes: qubes-upgrade-vm < 3.2
Provides: qubes-core-vm = %{version}-%{release}
@ -691,15 +688,8 @@ rm -f %{name}-%{version}
%files -n python2-dnf-plugins-qubes-hooks
%{python2_sitelib}/dnf-plugins/*
%if 0%{?fedora} >= 23
%files -n python3-dnf-plugins-qubes-hooks
%files -n python%{python3_pkgversion}-dnf-plugins-qubes-hooks
%{python3_sitelib}/dnf-plugins/*
%endif
%if 0%{?rhel} >= 7
%files -n python34-dnf-plugins-qubes-hooks
%{python3_sitelib}/dnf-plugins/*
%endif
%files qrexec
%config(noreplace) /etc/pam.d/qrexec