From 0cb30b7d2bffe8e4d8793af99530bb26779350e1 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Thu, 26 Sep 2019 12:49:22 -0400
Subject: [PATCH] Renumber sources

This gets rid of the vestigial remnants of the now-obsolete
release-to-master.patch , and moves gnulib to be earlier in our source list.

Signed-off-by: Peter Jones <pjones@redhat.com>
---
 grub.macros |  2 +-
 grub2.spec  | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/grub.macros b/grub.macros
index d2735cf..a218417 100644
--- a/grub.macros
+++ b/grub.macros
@@ -307,7 +307,7 @@ cp %{SOURCE6} .gitignore					\
 cp %{SOURCE7} bootstrap						\
 cp %{SOURCE8} bootstrap.conf					\
 cp %{SOURCE9} ./grub-core/tests/strtoull_test.c			\
-cp %{SOURCE12} gnulib-%{gnulibversion}.tar.gz			\
+cp %{SOURCE2} gnulib-%{gnulibversion}.tar.gz			\
 tar -zxf gnulib-%{gnulibversion}.tar.gz				\
 mv gnulib-%{gnulibversion} gnulib				\
 git init							\
diff --git a/grub2.spec b/grub2.spec
index e5175f5..47498ab 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -16,8 +16,8 @@ URL:		http://www.gnu.org/software/grub/
 Obsoletes:	grub < 1:0.98
 Source0:	https://ftp.gnu.org/gnu/grub/grub-%{tarversion}.tar.xz
 Source1:	grub.macros
-Source2:	grub.patches
-#Source3:	release-to-master.patch
+Source2:	gnulib-%{gnulibversion}.tar.gz
+Source3:	99-grub-mkconfig.install
 Source4:	http://unifoundry.com/unifont-5.1.20080820.pcf.gz
 Source5:	theme.tar.bz2
 Source6:	gitignore
@@ -25,14 +25,10 @@ Source7:	bootstrap
 Source8:	bootstrap.conf
 Source9:	strtoull_test.c
 Source10:	20-grub.install
-Source11:	99-grub-mkconfig.install
-Source12:	gnulib-%{gnulibversion}.tar.gz
+Source11:	grub.patches
 
 %include %{SOURCE1}
 
-# generate with do-rebase
-%include %{SOURCE2}
-
 BuildRequires:	gcc efi-srpm-macros
 BuildRequires:	flex bison binutils python3
 BuildRequires:	ncurses-devel xz-devel bzip2-devel
@@ -69,6 +65,9 @@ variety of kernel formats, file systems, computer architectures and \
 hardware devices.\
 %{nil}
 
+# generate with do-rebase
+%include %{SOURCE11}
+
 %description
 %{desc}
 
@@ -248,7 +247,7 @@ EOF
 # Install kernel-install scripts
 install -d -m 0755 %{buildroot}%{_prefix}/lib/kernel/install.d/
 install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE10}
-install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE11}
+install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE3}
 install -d -m 0755 %{buildroot}%{_sysconfdir}/kernel/install.d/
 # Install systemd user service to set the boot_success flag
 install -D -m 0755 -t %{buildroot}%{_userunitdir} \