From e9bb8f25fa3f377403cd3fdcfda3923bfda575b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Sun, 5 Feb 2023 00:07:46 +0100
Subject: [PATCH] Rearrange version suffix

Make it variant.dist (so, qubes.fc32), not dist.variant. This makes
it consistent with other packages, so the suffix is always
dist.arch.rpm.
---
 kernel.spec.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel.spec.in b/kernel.spec.in
index c255102f..90499788 100644
--- a/kernel.spec.in
+++ b/kernel.spec.in
@@ -3,15 +3,15 @@
 #
 
 %define variant qubes
-%define plainrel @REL@%{?dist}
+%define plainrel @REL@
 %define version %(echo '@VERSION@' | sed 's/-rc.*//')
 %define upstream_version @VERSION@
 %if "%{version}" != "%{upstream_version}"
 %define prerelease 1
-%define rel 0.%(echo '@VERSION@' | sed 's/.*-rc/rc/').%{plainrel}.%{variant}
+%define rel 0.%(echo '@VERSION@' | sed 's/.*-rc/rc/').%{plainrel}.%{variant}%{?dist}
 %else
 %define prerelease 0
-%define rel %{plainrel}.%{variant}
+%define rel %{plainrel}.%{variant}%{?dist}
 %endif
 
 %define name_suffix -latest
@@ -28,7 +28,7 @@
 %define build_src_dir %my_builddir/linux-%upstream_version
 %define src_install_dir /usr/src/kernels/%kernelrelease
 %define kernel_build_dir %my_builddir/linux-obj
-%define vm_install_dir /var/lib/qubes/vm-kernels/%upstream_version-%{plainrel}
+%define vm_install_dir /var/lib/qubes/vm-kernels/%upstream_version-%{plainrel}%{?dist}
 
 %define install_vdso 1
 %define debuginfodir /usr/lib/debug