From f28235df4133a85febc0bced4899b5070601d885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Mon, 8 Apr 2019 17:54:51 +0200
Subject: [PATCH] rpm: fix python3-* packaging

Use %{python3_pkgversion} instead of python3-/python34- directly.
Recently CentOS switched to python36-, which made it even more
important.
---
 rpm_spec/core-agent.spec.in | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in
index 9cc624f..ac23eb6 100644
--- a/rpm_spec/core-agent.spec.in
+++ b/rpm_spec/core-agent.spec.in
@@ -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