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
This commit is contained in:
DistroBaker 2021-02-03 13:16:30 +01:00
parent d88ac0f560
commit d7c365feda
1 changed files with 9 additions and 11 deletions

View File

@ -1,24 +1,22 @@
%define efivar_version 35-2 %define efivar_version 35-2
Summary: EFI Boot Manager
Name: efibootmgr Name: efibootmgr
Version: 16 Version: 16
Release: 9%{?dist} Release: 10%{?dist}
Summary: EFI Boot Manager
License: GPLv2+ License: GPLv2+
URL: https://github.com/rhboot/%{name}/ URL: https://github.com/rhboot/%{name}/
BuildRequires: gcc
BuildRequires: efi-srpm-macros >= 3-2 BuildRequires: efi-srpm-macros >= 3-2
BuildRequires: efi-filesystem BuildRequires: efi-filesystem
BuildRequires: git popt-devel BuildRequires: git popt-devel
BuildRequires: efivar-libs >= %{efivar_version} BuildRequires: efivar-libs >= %{efivar_version}
BuildRequires: efivar-devel >= %{efivar_version} BuildRequires: efivar-devel >= %{efivar_version}
BuildRequires: gcc
BuildRequires: make
Requires: efi-filesystem Requires: efi-filesystem
ExclusiveArch: %{efi} 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 Source0: https://github.com/rhboot/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
# Fixes to compiler errors manually cherry picked from upstream commit # Fixes to compiler errors manually cherry picked from upstream commit
@ -28,8 +26,7 @@ Patch0: efibootmgr-16-efidp_format_device_path-argfix.patch
%description %description
%{name} displays and allows the user to edit the Intel Extensible %{name} displays and allows the user to edit the Intel Extensible
Firmware Interface (EFI) Boot Manager variables. Additional Firmware Interface (EFI) Boot Manager variables. Additional
information about EFI can be found at information about EFI can be found at https://uefi.org/.
http://developer.intel.com/technology/efi/efi.htm and http://uefi.org/.
%prep %prep
%autosetup -S git %autosetup -S git
@ -39,19 +36,20 @@ git config --local --add efibootmgr.efidir %{efi_vendor}
%make_build CFLAGS='%{optflags}' LDFLAGS='%{build_ldflags}' %make_build CFLAGS='%{optflags}' LDFLAGS='%{build_ldflags}'
%install %install
rm -rf %{buildroot}
%make_install libdir=%{_libdir} bindir=%{_bindir} mandir=%{_mandir} \ %make_install libdir=%{_libdir} bindir=%{_bindir} mandir=%{_mandir} \
localedir=%{_datadir}/locale/ includedir=%{_includedir} \ localedir=%{_datadir}/locale/ includedir=%{_includedir} \
libexecdir=%{_libexecdir} datadir=%{_datadir} libexecdir=%{_libexecdir} datadir=%{_datadir}
%files %files
%{!?_licensedir:%global license %%doc}
%license COPYING %license COPYING
%{_sbindir}/* %{_sbindir}/*
%{_mandir}/*/*.?.gz %{_mandir}/*/*.?.gz
%doc README %doc README
%changelog %changelog
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 16-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Thu Aug 06 2020 Merlin Mathesius <mmathesi@redhat.com> - 16-9 * Thu Aug 06 2020 Merlin Mathesius <mmathesi@redhat.com> - 16-9
- FTBFS fixes for Rawhide and ELN - FTBFS fixes for Rawhide and ELN