From e66067a8e60ca691b6c9365d6de971c754be2068 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Tue, 14 Oct 2014 10:44:51 -0400
Subject: [PATCH] Make this more like master/f21/f20

Signed-off-by: Peter Jones <pjones@redhat.com>
---
 .gitignore | 5 +++--
 shim.spec  | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index b930343..f930f0c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
-/mokutil-*.tar.bz2
-/shim-*.tar.bz2
+*.tar.*
+clog
+*.rpm
diff --git a/shim.spec b/shim.spec
index b660479..6937a6f 100644
--- a/shim.spec
+++ b/shim.spec
@@ -5,7 +5,7 @@ Summary:        First-stage UEFI bootloader
 
 License:        BSD
 URL:            http://www.codon.org.uk/~mjg59/shim/
-Source0:        http://www.codon.org.uk/~mjg59/shim/shim-%{version}.tar.bz2
+Source0:        https://github.com/mjg59/%{name}/releases/download/%{version}/%{name}-%{version}.tar.bz2
 Source1:	fedora-ca.cer
 
 # currently here's what's in our dbx:
@@ -54,9 +54,9 @@ Initial UEFI bootloader that handles chaining to a trusted full bootloader
 under secure boot environments.
 
 %prep
-%setup -q -n shim-%{version}
+%setup -q
 git init
-git config user.email "shim-owner@fedoraproject.org"
+git config user.email "%{name}-owner@fedoraproject.org"
 git config user.name "Fedora Ninjas"
 git add .
 git commit -a -q -m "%{version} baseline."
@@ -69,7 +69,7 @@ MAKEFLAGS=""
 if [ -f "%{SOURCE1}" ]; then
 	MAKEFLAGS="VENDOR_CERT_FILE=%{SOURCE1} VENDOR_DBX_FILE=%{SOURCE2}"
 fi
-make ${MAKEFLAGS} shim.efi MokManager.efi fallback.efi
+make 'DEFAULT_LOADER=\\\\grubx64.efi' ${MAKEFLAGS} shim.efi MokManager.efi fallback.efi
 
 %install
 rm -rf $RPM_BUILD_ROOT