.gitignore

@@ -1,2 +1,6 @@
-SOURCES/efibootmgr-16.tar.bz2
+clog
-/efibootmgr-16.tar.bz2
+.build*.log
+*.rpm
+*.tar.*
+.build*.log
+efibootmgr-*/

efibootmgr.spec

@@ -1,63 +1,123 @@
-%define efivar_version 35-1
+%define efivar_version 35-2
 
-Summary: EFI Boot Manager
 Name: efibootmgr
-Version: 16
+Version: 18
-Release: 1%{?dist}
+Release: 8%{?dist}
-Group: System Environment/Base
+Summary: EFI Boot Manager
-License: GPLv2+
+License: GPL-2.0-or-later
-URL: http://github.com/rhinstaller/%{name}/
+URL: https://github.com/rhboot/%{name}/
-BuildRequires: git, popt-devel
+
+BuildRequires: efi-srpm-macros >= 3-2
+BuildRequires: efi-filesystem
+BuildRequires: git popt-devel
 BuildRequires: efivar-libs >= %{efivar_version}
 BuildRequires: efivar-devel >= %{efivar_version}
-# EFI/UEFI don't exist on PPC
+BuildRequires: gcc
-ExclusiveArch: %{ix86} x86_64 aarch64 arm
+BuildRequires: make
+Requires: efi-filesystem
+ExclusiveArch: %{efi}
 
-# for RHEL / Fedora when efibootmgr was part of the elilo package
+Source0: https://github.com/rhboot/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
-Conflicts: elilo <= 3.6-6
+Source1: efibootmgr.patches
-Obsoletes: elilo <= 3.6-6
 
-Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
+%include %{SOURCE1}
-
-%global efidir %(eval echo $(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/'))
 
 %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
+information about EFI can be found at https://uefi.org/.
-http://developer.intel.com/technology/efi/efi.htm and http://uefi.org/.
 
 %prep
-%setup -q
+%autosetup -S git
-git init
+git config --local --add efibootmgr.efidir %{efi_vendor}
-git config user.email "example@example.com"
-git config user.name "RHEL Ninjas"
-git add .
-git commit -a -q -m "%{version} baseline."
-git am %{patches} </dev/null
-git config --unset user.email
-git config --unset user.name
 
 %build
-make %{?_smp_mflags} CFLAGS='%{optflags}' LDFLAGS='%{build_ldflags}' \
+%make_build CFLAGS='%{optflags}' LDFLAGS='%{build_ldflags}'
-  EFIDIR=%{efidir}
 
 %install
-rm -rf %{buildroot}
+%make_install libdir=%{_libdir} bindir=%{_bindir} mandir=%{_mandir} \
-%make_install EFIDIR=%{efidir} libdir=%{_libdir} \
+	      localedir=%{_datadir}/locale/ includedir=%{_includedir} \
-       bindir=%{_bindir} mandir=%{_mandir} localedir=%{_datadir}/locale/ \
+	      libexecdir=%{_libexecdir} datadir=%{_datadir}
-       includedir=%{_includedir} libexecdir=%{_libexecdir} \
-       datadir=%{_datadir}
 
 %files
-%defattr(-,root,root,-)
-%{!?_licensedir:%global license %%doc}
 %license COPYING
 %{_sbindir}/*
 %{_mandir}/*/*.?.gz
 %doc README
 
 %changelog
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com>
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com>
+- Bump release for June 2024 mass rebuild
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Dec 13 2023 Nicolas Frayer <nfrayer@redhat.com>
+- Migrate to SPDX license
+- Please refer to https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jul 07 2022 Robbie Harwood <rharwood@redhat.com> - 18-1
+- New upstream version (18)
+
+* Tue Jul 05 2022 Robbie Harwood <rharwood@redhat.com> - 17-1
+- New upstream version (17)
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 16-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 16-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* 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
+- FTBFS fixes for Rawhide and ELN
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 16-9
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 16-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 16-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 16-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 16-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 16-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri May 04 2018 Peter Jones <pjones@redhat.com> - 16-3
+- Rebuild for new efi-rpm-macros, now that it has settled down a bit.
+
+* Wed May 02 2018 Peter Jones <pjones@redhat.com> - 16-2
+- Use %%{efi} and similar macros from efi-rpm-macros
+- Use '%%autosetup -S git' now that it imports patches without rewriting
+  the commit message.
+- Fix some URLs maybe.
+
 * Mon Apr 09 2018 Peter Jones <pjones@redhat.com> - 16-1
 - efibootmgr 16
 - better coverity and clang-analyzer support

gating.yaml

@@ -1,6 +1,6 @@
 --- !Policy
 product_versions:
-  - rhel-8
+  - rhel-10
 decision_context: osci_compose_gate
 rules:
   - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

sources

@@ -1 +1 @@
-SHA512 (efibootmgr-16.tar.bz2) = 936318c7163c07b716f89be3d830957d9db68ba1b059223f7ea3d9eafe0dbf1c91b9aee096f5aed70955c6052c3b8547295c0a47f17cdf43788259d87d1990b9
+SHA512 (efibootmgr-18.tar.bz2) = 59112a3da3bad782ae893e1390f5a371474392f9779a2769a9d56335760b611b5330fe57b46e8d858d237786230162a0947261769c02c960549be6c1f6a5f4a6