From aa0e9e6fd16d775d91a999918aa6f85d82ca698b Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 2 Oct 2018 14:11:56 -0400 Subject: [PATCH] More %%dist shenanigans. Signed-off-by: Peter Jones --- shim.rpmmacros | 1 + shim.spec | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/shim.rpmmacros b/shim.rpmmacros index 7f16023..3c4fc12 100644 --- a/shim.rpmmacros +++ b/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} \ diff --git a/shim.spec b/shim.spec index ec9b581..33e349e 100644 --- a/shim.spec +++ b/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/