From 6f86d929e982eb8af7ffd6f11e5a84f0ab212f04 Mon Sep 17 00:00:00 2001 From: Nicolas Frayer Date: Tue, 30 Jul 2024 16:59:57 +0200 Subject: [PATCH] Update to efi-rpm-macros version 6 Resolves: #RHEL-50848 Signed-off-by: Nicolas Frayer --- efi-rpm-macros.spec | 15 ++++++++------- sources | 1 + 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/efi-rpm-macros.spec b/efi-rpm-macros.spec index 06e888e..0673fda 100644 --- a/efi-rpm-macros.spec +++ b/efi-rpm-macros.spec @@ -1,17 +1,14 @@ Summary: Common RPM Macros for building EFI-related packages Name: efi-rpm-macros -Version: 5 -Release: 12%{?dist} +Version: 6 +Release: 3%{?dist} License: GPL-3.0-or-later URL: https://github.com/rhboot/%{name}/ BuildRequires: git sed BuildRequires: make BuildArch: noarch -Source0: https://github.com/rhboot/%{name}/releases/download/%{version}/%{name}-5.tar.bz2 - -Patch0001: 0001-Don-t-have-arm-as-an-alt-arch-of-aarch64.patch -Patch0002: 0002-Makefile-fix-permission-on-boot-efi-EFI.patch +Source0: https://github.com/rhboot/%{name}/releases/download/%{version}/%{name}-6.tar.bz2 %global debug_package %{nil} %global _efi_vendor_ %(eval echo $(sed -n -e 's/rhel/redhat/' -e 's/^ID=//p' /etc/os-release)) @@ -37,7 +34,7 @@ The efi-filesystem package contains the basic directory layout for EFI machine bootloaders and tools. %prep -%autosetup -S git_am -n %{name}-5 +%autosetup -S git_am -n %{name}-6 git config --local --add efi.vendor "%{_efi_vendor_}" git config --local --add efi.esp-root /boot/efi git config --local --add efi.arches "x86_64 aarch64 %{arm} %{ix86}" @@ -69,6 +66,10 @@ git config --local --add efi.arches "x86_64 aarch64 %{arm} %{ix86}" %dir /boot/efi/EFI/%{_efi_vendor_} %changelog +* Tue Jul 30 2024 Nicolas Frayer - 6-3 +- Update to efi-rpm-macros version 6 +- Resolves: #RHEL-50848 + * Mon Jun 24 2024 Troy Dawson - 5-12 - Bump release for June 2024 mass rebuild diff --git a/sources b/sources index 59483d0..fae2979 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (efi-rpm-macros-5.tar.bz2) = 571d35b76e982bfc3cfbc5d09a871057ac47aa78814262e853ef121e36853886d41b140d79e591976091b8f3b015f85eafa2c881eb468b7d10c1618381013954 +SHA512 (efi-rpm-macros-6.tar.bz2) = 2c5dcf96af549e519665082519c877f5379b3df0a341990ddea52c98e6e0e34495e0996513522b7facc1812d707cca90bd18dbbb75869b29b869716591867015