From a10eeac18f2903c912edd3e155f632001b01c360 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 31 2020 09:41:16 +0000 Subject: debrand grub2-2.02-0.81.el7 --- diff --git a/.gitignore b/.gitignore index 8173666..1118eab 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ 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 a7bf121..c59c687 100644 --- a/.grub2.metadata +++ b/.grub2.metadata @@ -1,2 +1,3 @@ 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 44ba5ea..91c5f42 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: securebootca.cer -Source4: secureboot.cer +Source3: centos.cer +#(source removed) Source5: http://unifoundry.com/unifont-5.1.20080820.pcf.gz Source6: gitignore @@ -51,6 +51,9 @@ 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} @@ -464,6 +467,10 @@ fi %endif %changelog +* Tue Mar 31 2020 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