More %%dist shenanigans.

Signed-off-by: Peter Jones <pjones@redhat.com>

shim.rpmmacros

@@ -44,6 +44,7 @@
 %define define_pkg(a:p:)						\
 %{expand:%%package -n shim-%{-a*}}					\
 Summary: First-stage UEFI bootloader					\
+Release: %{releasever}%{?dist}						\
 Requires: mokutil >= 1:0.2.0-1						\
 Requires: efi-filesystem						\
 Provides: shim-signed-%{-a*} = %{version}-%{release}			\

shim.spec

@@ -1,11 +1,13 @@
 # this is to make us only expand %%{dist} if we're on a modularity build.
 # it's 2 macros make vim's \c not put a brace at the end of the changelog.
+%global realdist %{expand:%{?dist}}
 %global _dist %{expand:%{?_module_build:%%{?dist}}}
 %global dist %{expand:%%{_dist}}
 
 Name:		shim
 Version:	15
-Release:	7%{?dist}
+%global releasever 7
+Release:	%{releasever}%{?realdist}
 Summary:	First-stage UEFI bootloader
 License:	BSD
 URL:		https://github.com/rhboot/shim/