--- rpms/e-smith-grub/sme10/e-smith-grub.spec 2016/02/05 22:59:15 1.1 +++ rpms/e-smith-grub/sme10/e-smith-grub.spec 2016/06/14 19:08:35 1.5 @@ -1,21 +1,23 @@ -# $Id: e-smith-grub.spec,v 1.4 2016/01/20 20:44:59 vip-ire Exp $ +# $Id: e-smith-grub.spec,v 1.4 2016/03/18 14:10:42 unnilennium 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 1 +%define release 4 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.xz Source1: smeserver.xpm.gz +Source2: smeserver10.png +Patch0: e-smith-grub-2.6.0.grub2adaptation.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools BuildArchitectures: noarch Requires: e-smith-lib >= 1.15.3-17 -Requires: grub +Requires: grub2 Provides: system-logos Obsoletes: e-smith-lilo Provides: e-smith-bootloader @@ -23,6 +25,15 @@ Obsoletes: lilo AutoReqProv: no %changelog +* Tue Jun 14 2016 stephane de Labrusse 2.6.0-4.sme +- Adaptation to grub2 [SME: 9321] + +* Fri Mar 18 2016 Jean-Philipe Pialasse 2.6.0-3.sme +- rebuild for Bug [SME: 9347] + +* Fri Mar 18 2016 JP Pialasse 2.6.0-2.sme +- fix Requires grub2 [SME: 9320] + * Fri Feb 05 2016 stephane de Labrusse 2.6.0-1.sme - Initial release to sme10 @@ -188,12 +199,13 @@ e-smith server enhancement to grub bootl %prep %setup -cp %{SOURCE1} root/boot/grub/ +%patch0 -p1 + +cp %{SOURCE1} root/boot/grub +cp %{SOURCE2} root/boot/grub %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