pool/grub2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 156328 from home:fcrozat:branches:Base:System

Browse Source 
- 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
This commit is contained in:
Jiri Slaby 2013-02-25 14:17:52 +00:00 committed by Git OBS Bridge
parent b0a5de8f8d
commit b47c9b3bb7
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
grub2.changes
View File

@ -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 Tue Feb 19 15:38:04 UTC 2013 - duwe@suse.com

8
grub2.spec
View File

@ -46,7 +46,7 @@ BuildRequires: texinfo
BuildRequires: python BuildRequires: python
BuildRequires: xz-devel BuildRequires: xz-devel
%ifarch x86_64 %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 BuildRequires: pesign-obs-integration
%endif %endif
%endif %endif
@ -79,7 +79,7 @@ BuildRequires: pesign-obs-integration
%endif %endif
%endif %endif
%if 0%{?suse_version} == 1110 || 0%{?sles_version} == 11 %if 0%{?suse_version} == 1110
%define only_efi %{nil} %define only_efi %{nil}
%define only_x86_64 %{nil} %define only_x86_64 %{nil}
%endif %endif
@ -233,7 +233,7 @@ provides support for EFI systems.
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
# Workaround SLE11's patch utility did not rename the file for us # 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 mv docs/grub.texi docs/grub2.texi
%endif %endif
%patch2 -p1 %patch2 -p1
@ -355,7 +355,7 @@ make %{?_smp_mflags}
%install %install
%ifarch %{efi} %ifarch %{efi}
%ifarch x86_64 %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" export BRP_PESIGN_FILES="%{_libdir}/%{name}/%{grubefiarch}/grub.efi"
%endif %endif
%endif %endif