--- rpms/e-smith-grub/sme10/e-smith-grub.spec	2016/03/18 14:09:31	1.3
+++ rpms/e-smith-grub/sme10/e-smith-grub.spec	2021/04/17 03:35:18	1.17
@@ -1,19 +1,28 @@
-# $Id: e-smith-grub.spec,v 1.2 2016/03/17 16:54:29 unnilennium Exp $
+# $Id: e-smith-grub.spec,v 1.16 2021/02/20 17:15:01 jpp Exp $
 
-Summary: e-smith module to configure grub
+Summary: e-smith module to configure grub2
 %define name e-smith-grub
 Name: %{name}
-%define version 2.6.0
-%define release 3
+%define version 2.6.1
+%define release 11
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
-Source1: smeserver.xpm.gz
+Source1: smeserver10.png
+Source2: koozali.tar.xz
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
 BuildArchitectures: noarch
+Patch0: e-smith-grub-2.6.1.bz9668.AddFullPath2GrubAction.patch
+Patch1: e-smith-grub-2.6.0-bz10211-enableXFSquota.patch
+Patch2: e-smith-grub-2.6.1.bz9728.AddGrubThemeKoozali.patch
+Patch3: e-smith-grub-2.6.1-bz11137-update.patch
+Patch4: e-smith-grub-2.6.1-efi.patch
+Patch5: e-smith-grub-2.6.1-bz11365-unabletobootext4rootfs.patch
+Patch6: e-smith-grub-2.6.1-bz11559-setlocale-in-manager.patch
+
 Requires: e-smith-lib >= 1.15.3-17
 Requires: grub2
 Provides: system-logos
@@ -23,11 +32,48 @@ Obsoletes: lilo
 AutoReqProv: no
 
 %changelog
+* Fri Apr 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.1-11.sme
+- set missing locale if update-grub called by server-manager [SME: 11559]
+
+* Sat Feb 20 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.1-10.sme
+- fix unable to boot on a non xfs root filesystem [SME: 11365]
+
+* Thu Feb 18 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.1-9.sme
+- cleanup remove /boot/grub dir [SME: 11354]
+
+* Wed Jan 17 2021 Chris Sansom-Ninnes <chris@sansom.ninnes.net> 2.6.1-8.sme
+- Add support for EFI systems [SME: 10998]
+
+* Wed Jan 06 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.1-7.sme
+- add update event [SME: 11137]
+
+* Thu May 25 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.1-6.sme
+- rebuild for file ownership conflict [SME: 10325]
+
+* Thu May 11 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.1-5.sme
+- fix edition and consol grub terminal not visible because of koozali logo [SME: 9728]
+
+* Wed Apr 05 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.1-4.sme
+- enable quota for groups and users with XFS [SME: 10211]
+
+* Mon Jul 25 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.1-3.sme
+- Koozali grub splash screen
+
+* Sat Jul 16 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.1-2.sme
+- Write the full path for the grub Action [SME: 9668]
+- Added e-smith-grub-2.6.1.bz9668.AddFullPath2GrubAction.patch
+
+* Wed Jun 15 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.1-1.sme
+- New source [SME: 9321]
+
+* Tue Jun 14 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.0-4.sme
+- Adaptation to grub2 [SME: 9321]
+
 * Fri Mar 18 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-3.sme
 - rebuild for Bug [SME: 9347]
 
-* Fri Feb 18 2016 JP Pialasse <tests@pialasse.com> 2.6.0-2.sme
-- fix Requires grub2 [SME:9320]
+* Fri Mar 18 2016 JP Pialasse <tests@pialasse.com> 2.6.0-2.sme
+- fix Requires grub2 [SME: 9320]
 
 * Fri Feb 05 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.0-1.sme
 - Initial release to sme10
@@ -194,12 +240,21 @@ e-smith server enhancement to grub bootl
 
 %prep
 %setup
-cp %{SOURCE1} root/boot/grub/
+mkdir -p root/boot/grub2/themes
+cp %{SOURCE1} root/boot/grub2
+%setup -T -D -a 2
+mv koozali root/boot/grub2/themes/ 
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+rm -rf root/boot/grub
+%patch5 -p1
+%patch6 -p1
 
 %build
 perl createlinks
-mkdir -p root/etc/e-smith/events/local/templates2expand/etc/sysconfig
-touch root/etc/e-smith/events/local/templates2expand/etc/sysconfig/kernel
 
 %install
 rm -rf $RPM_BUILD_ROOT