From b47c9b3bb7369862174e50f697fd70c6658e67d08aa47e67efbfdecdf508eaaf Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Mon, 25 Feb 2013 14:17:52 +0000 Subject: [PATCH] Accepting request 156328 from home:fcrozat:branches:Base:System - Fix build for SLES 11. OBS-URL: https://build.opensuse.org/request/show/156328 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=19 --- grub2.changes | 5 +++++ grub2.spec | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/grub2.changes b/grub2.changes index 322c6ba..797a0e5 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 25 13:31:31 UTC 2013 - fcrozat@suse.com + +- Fix build for SLES 11. + ------------------------------------------------------------------- Tue Feb 19 15:38:04 UTC 2013 - duwe@suse.com diff --git a/grub2.spec b/grub2.spec index 52b0e2a..02948ac 100644 --- a/grub2.spec +++ b/grub2.spec @@ -46,7 +46,7 @@ BuildRequires: texinfo BuildRequires: python BuildRequires: xz-devel %ifarch x86_64 -%if 0%{?suse_version} >= 1230 || 0%{?sles_version} >= 11 +%if 0%{?suse_version} >= 1230 || 0%{?suse_version} == 1110 BuildRequires: pesign-obs-integration %endif %endif @@ -79,7 +79,7 @@ BuildRequires: pesign-obs-integration %endif %endif -%if 0%{?suse_version} == 1110 || 0%{?sles_version} == 11 +%if 0%{?suse_version} == 1110 %define only_efi %{nil} %define only_x86_64 %{nil} %endif @@ -233,7 +233,7 @@ provides support for EFI systems. %patch0 -p1 %patch1 -p1 # Workaround SLE11's patch utility did not rename the file for us -%if 0%{?suse_version} == 1110 || 0%{?sles_version} == 11 +%if 0%{?suse_version} == 1110 mv docs/grub.texi docs/grub2.texi %endif %patch2 -p1 @@ -355,7 +355,7 @@ make %{?_smp_mflags} %install %ifarch %{efi} %ifarch x86_64 -%if 0%{?suse_version} >= 1230 || 0%{?sles_version} >= 11 +%if 0%{?suse_version} >= 1230 || 0%{?suse_version} == 1110 export BRP_PESIGN_FILES="%{_libdir}/%{name}/%{grubefiarch}/grub.efi" %endif %endif