From 3506e5752296a26d4988eadec0dd68c5b012fbe9 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Tue, 2 Oct 2018 14:19:54 -0400
Subject: [PATCH] Revert "More %%dist shenanigans."

It's pointless, because doesn't actually get around the real problem.

This reverts commit aa0e9e6fd16d775d91a999918aa6f85d82ca698b.
---
 shim.rpmmacros | 1 -
 shim.spec      | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/shim.rpmmacros b/shim.rpmmacros
index 3c4fc12..7f16023 100644
--- a/shim.rpmmacros
+++ b/shim.rpmmacros
@@ -44,7 +44,6 @@
 %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 33e349e..ec9b581 100644
--- a/shim.spec
+++ b/shim.spec
@@ -1,13 +1,11 @@
 # 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
-%global releasever 7
-Release:	%{releasever}%{?realdist}
+Release:	7%{?dist}
 Summary:	First-stage UEFI bootloader
 License:	BSD
 URL:		https://github.com/rhboot/shim/