From c197f7b6ad4d3c570d1a91404b02dcbda98cf5cc Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 02 2019 20:08:14 +0000 Subject: import grub2-2.02-0.81.el7 --- diff --git a/.gitignore b/.gitignore index 1118eab..8173666 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ SOURCES/grub-2.02~beta2.tar.xz SOURCES/unifont-5.1.20080820.pcf.gz -SOURCES/centos.cer diff --git a/.grub2.metadata b/.grub2.metadata index c59c687..a7bf121 100644 --- a/.grub2.metadata +++ b/.grub2.metadata @@ -1,3 +1,2 @@ 1bf580f1e8bce4909a7ac7ca485cee02b00ed383 SOURCES/grub-2.02~beta2.tar.xz 87f8600ba24e521b5d20bdf6c4b71af8ae861e3a SOURCES/unifont-5.1.20080820.pcf.gz -6e9105eb51e55a46761838f289a917611cad8091 SOURCES/centos.cer diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec index 9135d6d..44ba5ea 100644 --- a/SPECS/grub2.spec +++ b/SPECS/grub2.spec @@ -15,8 +15,8 @@ Source0: ftp://alpha.gnu.org/gnu/grub/grub-%{tarversion}.tar.xz #Source0: ftp://ftp.gnu.org/gnu/grub/grub-%%{tarversion}.tar.xz Source1: grub.macros Source2: grub.patches -Source3: centos.cer -#(source removed) +Source3: securebootca.cer +Source4: secureboot.cer Source5: http://unifoundry.com/unifont-5.1.20080820.pcf.gz Source6: gitignore @@ -51,9 +51,6 @@ BuildRequires: pesign >= 0.99-8 %if %{?_with_ccache: 1}%{?!_with_ccache: 0} BuildRequires: ccache %endif -%if 0%{?centos} -%global efidir centos -%endif ExcludeArch: s390 s390x %{arm} %{?ix86} Obsoletes: %{name} <= %{flagday} @@ -467,10 +464,6 @@ fi %endif %changelog -* Sat Nov 02 2019 CentOS Sources - 2.02-0.81.el7.centos -- Roll in CentOS Secureboot keys -- Move the edidir to be CentOS, so people can co-install fedora, rhel and centos - * Fri Sep 13 2019 Javier Martinez Canillas - 2.02-0.81 - Only make grub2-tools Obsoletes and Provides grub2-tools-efi for x86_64 Resolves: rhbz#1748019