ngompa pushed to rpms/rEFInd (f37). "Fix rEFInd metapackage dependencies and syntax error in refind-install"

Notification time stamped 2022-12-31 23:06:40 UTC

From 8066ca107d6434ba7927fffe4e2f555235443a27 Mon Sep 17 00:00:00 2001
From: Neal Gompa 
Date: Dec 31 2022 23:04:39 +0000
Subject: Fix rEFInd metapackage dependencies and syntax error in refind-install

---

diff --git a/detect-efi-size.patch b/detect-efi-size.patch
index ce107f2..a638607 100644
--- a/detect-efi-size.patch
+++ b/detect-efi-size.patch
@@ -1,8 +1,8 @@
 diff --git a/refind-install b/refind-install
-index dfb8781..88dcf40 100755
+index dfb8781..b9b932c 100755
 --- a/refind-install
 +++ b/refind-install
-@@ -285,13 +285,23 @@ DeterminePlatform() {
+@@ -285,13 +285,24 @@ DeterminePlatform() {
        esac
        ;;
     linux*)
@@ -24,10 +24,11 @@ index dfb8781..88dcf40 100755
 +         *)
 +             Platform="x64"
 +             ;;
++         esac
           ;;
        i?86)
           Platform="ia32"
-@@ -299,13 +309,6 @@ DeterminePlatform() {
+@@ -299,13 +310,6 @@ DeterminePlatform() {
           # abort. Not in BIOS mode, though, since that could be used on an emergency
           # disc to try to recover a troubled Linux installation.
           if [[ -d /sys/firmware/efi ]] ; then
diff --git a/rEFInd.spec b/rEFInd.spec
index c3e01c2..1a85ad7 100644
--- a/rEFInd.spec
+++ b/rEFInd.spec
@@ -31,7 +31,7 @@ Linux kernels that provide EFI stub support.

Name:		rEFInd
 Version:	0.13.3.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	User friendly EFI boot manager
 License:	GPL-3.0-or-later

@@ -55,7 +55,7 @@ BuildRequires:	gnu-efi-devel
 Requires:	efi-filesystem
 Requires:	efibootmgr
 Requires:	%{name}-tools = %{version}-%{release}
-Requires:	%{name}-bootloader = %{version}
+Requires:	%{name}-bootloader-%{efi_arch} = %{version}
 Suggests:	%{name}-signed-%{efi_arch}

# These were vendored and adapted into rEFInd long ago...
@@ -107,6 +107,7 @@ of %{name} on your system.
 Summary:	User friendly EFI boot manager (unsigned binaries)
 Requires:	%{name}-tools = %{version}-%{release}
 Provides:	%{name}-bootloader = %{version}
+Provides:	%{name}-bootloader-%{efi_arch} = %{version}
 BuildArch:	noarch

%description unsigned-%{efi_arch} %{_description}
@@ -173,6 +174,10 @@ echo "no need to install this update in the ESP."                       >> READM

%changelog
+* Sat Dec 31 2022 Neal Gompa  - 0.13.3.1-5
+- Make sure rEFInd metapackage pulls in correct bootloader package (rhbz#2157177)
+- Fix syntax error in refind-install caused by efi-size detection patch (rhbz#2157178)
+
 * Mon Oct 24 2022 Neal Gompa  - 0.13.3.1-4
 - Exclude 32-bit ARM architectures

https://src.fedoraproject.org/rpms/rEFInd/c/8066ca107d6434ba7927fffe4e2f5552...