More %%dist shenanigans.

Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2018-10-02 14:11:56 -04:00
parent a069325bd5
commit aa0e9e6fd1
2 changed files with 4 additions and 1 deletions

View File

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

View File

@ -1,11 +1,13 @@
# this is to make us only expand %%{dist} if we're on a modularity build. # 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. # 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:%{?_module_build:%%{?dist}}}
%global dist %{expand:%%{_dist}} %global dist %{expand:%%{_dist}}
Name: shim Name: shim
Version: 15 Version: 15
Release: 7%{?dist} %global releasever 7
Release: %{releasever}%{?realdist}
Summary: First-stage UEFI bootloader Summary: First-stage UEFI bootloader
License: BSD License: BSD
URL: https://github.com/rhboot/shim/ URL: https://github.com/rhboot/shim/