From d7c365feda18c30193dc175bc68e4f8d3fc3d27e Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Wed, 3 Feb 2021 13:16:30 +0100 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/efibootmgr.git#882ca15a278d85f4e3e6c8850bd1abf18c4e5ad5 --- efibootmgr.spec | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/efibootmgr.spec b/efibootmgr.spec index 03368f0..abee6ca 100644 --- a/efibootmgr.spec +++ b/efibootmgr.spec @@ -1,24 +1,22 @@ %define efivar_version 35-2 -Summary: EFI Boot Manager Name: efibootmgr Version: 16 -Release: 9%{?dist} +Release: 10%{?dist} +Summary: EFI Boot Manager License: GPLv2+ URL: https://github.com/rhboot/%{name}/ -BuildRequires: gcc + BuildRequires: efi-srpm-macros >= 3-2 BuildRequires: efi-filesystem BuildRequires: git popt-devel BuildRequires: efivar-libs >= %{efivar_version} BuildRequires: efivar-devel >= %{efivar_version} +BuildRequires: gcc +BuildRequires: make Requires: efi-filesystem ExclusiveArch: %{efi} -# for RHEL / Fedora when efibootmgr was part of the elilo package -Conflicts: elilo <= 3.6-6 -Obsoletes: elilo <= 3.6-6 - Source0: https://github.com/rhboot/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 # Fixes to compiler errors manually cherry picked from upstream commit @@ -28,8 +26,7 @@ Patch0: efibootmgr-16-efidp_format_device_path-argfix.patch %description %{name} displays and allows the user to edit the Intel Extensible Firmware Interface (EFI) Boot Manager variables. Additional -information about EFI can be found at -http://developer.intel.com/technology/efi/efi.htm and http://uefi.org/. +information about EFI can be found at https://uefi.org/. %prep %autosetup -S git @@ -39,19 +36,20 @@ git config --local --add efibootmgr.efidir %{efi_vendor} %make_build CFLAGS='%{optflags}' LDFLAGS='%{build_ldflags}' %install -rm -rf %{buildroot} %make_install libdir=%{_libdir} bindir=%{_bindir} mandir=%{_mandir} \ localedir=%{_datadir}/locale/ includedir=%{_includedir} \ libexecdir=%{_libexecdir} datadir=%{_datadir} %files -%{!?_licensedir:%global license %%doc} %license COPYING %{_sbindir}/* %{_mandir}/*/*.?.gz %doc README %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 16-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Aug 06 2020 Merlin Mathesius - 16-9 - FTBFS fixes for Rawhide and ELN