From f1ff9cd3ea41ca9b6700270f4837d9b31a73dd5d Mon Sep 17 00:00:00 2001
From: Johnny Hughes <johnny@centos.org>
Date: Oct 03 2017 15:22:40 +0000
Subject: manual debranding


---

diff --git a/README.debrand b/README.debrand
deleted file mode 100644
index 01c46d2..0000000
--- a/README.debrand
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: This package was configured for automatic debranding, but the changes
-failed to apply.
diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec
index 4383e1e..340b4ab 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
 
@@ -100,7 +100,7 @@ Requires(post): dracut
 %{desc}
 This subpackage provides tools for support of all platforms.
 
-%ifarch x86_64
+%ifarch x86_64 %{ix86}
 %package tools-efi
 Summary:	Support tools for GRUB.
 Group:		System Environment/Base
@@ -161,10 +161,10 @@ This subpackage provides tools for support of all platforms.
 
 %build
 %if 0%{with_efi_arch}
-%do_primary_efi_build %{grubefiarch} %{grubefiname} %{grubeficdname} %{_target_platform} "'%{efi_cflags}'" %{SOURCE3} %{SOURCE4} redhatsecureboot301
+%do_primary_efi_build %{grubefiarch} %{grubefiname} %{grubeficdname} %{_target_platform} "'%{efi_cflags}'" %{SOURCE3} %{SOURCE3} redhatsecureboot301
 %endif
 %if 0%{with_alt_efi_arch}
-%do_alt_efi_build %{grubaltefiarch} %{grubaltefiname} %{grubalteficdname} %{_alt_target_platform} "'%{alt_efi_cflags}'" %{SOURCE3} %{SOURCE4} redhatsecureboot301
+%do_alt_efi_build %{grubaltefiarch} %{grubaltefiname} %{grubalteficdname} %{_alt_target_platform} "'%{alt_efi_cflags}'" %{SOURCE3} %{SOURCE3} redhatsecureboot301
 %endif
 %if 0%{with_legacy_arch}
 %do_legacy_build %{grublegacyarch}
@@ -176,6 +176,13 @@ set -e
 rm -fr $RPM_BUILD_ROOT
 
 %do_common_install
+# Fix for hardcoded efidir
+sed -i.orig -e 's@/efi/EFI/redhat/@/efi/EFI/%{efidir}/@' \
+    grub-%{tarversion}/util/grub-setpassword.in
+touch --reference=grub-%{tarversion}/util/grub-setpassword.in.orig \
+    grub-%{tarversion}/util/grub-setpassword.in
+rm -f grub-%{tarversion}/util/grub-setpassword.in.orig
+
 %if 0%{with_efi_arch}
 %do_efi_install %{grubefiarch} %{grubefiname} %{grubeficdname}
 %endif
@@ -454,6 +461,9 @@ fi
 %endif
 
 %changelog
+* Wed Aug  9 2017 Johnny Hughes <johnny@centos.org> - 2.02-0.64
+- Manual Debranding after auto debranding failed
+
 * Wed May 31 2017 Peter Jones <pjones@redhat.com> - 2.02-0.64
 - Revert pkglibdir usage; we have to coordinate this with Lorax.
   Related: rhbz#1455243