Attachment 9710 Details for Bug 21811 – Updated patch to remove hard conflicts and apply previous explained changes

[patch] Updated patch to remove hard conflicts and apply previous explained changes

Fix_Grub2_Conflicts.Patch (text/plain), 1.31 KB, created by Jeremiah Summers on 2017-10-08 00:17:58 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremiah Summers

Created: 2017-10-08 00:17:58 CEST

Size: 1.31 KB

patch

obsolete

>--- grub2.spec	2017-10-07 15:14:31.573491397 -0700
>+++ grub2.spec.unity	2017-10-07 15:11:58.497865472 -0700
>@@ -20,7 +20,7 @@
> %global tarversion 2.02~beta3
> %global pc_arch i386-pc
> %define git	10463
>-%define rel	9
>+%define rel	10
> 
> Name:		grub2
> Version:	2.02
>@@ -103,7 +103,6 @@
> BuildRequires:	ruby
> BuildRequires:	texinfo
> 
>-Conflicts:	%{name}-efi
> Provides:	bootloader
> Provides:	grub2bootloader = %{version}-%{release}
> Requires:	%{name}-common = %{version}-%{release}
>@@ -121,7 +120,6 @@
> Summary:	Boot-loader with support for EFI
> Group:		System/Boot and Init
> 
>-Conflicts:	%{name}
> Requires(post):	efibootmgr
> Provides:	bootloader
> Provides:	grub2bootloader = %{version}-%{release}
>@@ -423,7 +421,6 @@
> 
> %ifnarch %arm
> %files
>-%dir %{_libdir}/grub
> %dir %{_libdir}/grub/i386-pc
> %{_libdir}/grub/i386-pc/*
> %endif
>@@ -431,14 +428,12 @@
> %ifnarch %arm
> %files efi 
> %doc README.efi
>-%dir %{_libdir}/grub
> %dir %{_libdir}/grub/%{efi_arch}
> %{_libdir}/grub/%{efi_arch}/*
> %endif
> 
> %ifarch %arm
> %files uboot
>-%dir %{_libdir}/grub
> %dir %{_libdir}/grub/%{efi_arch}
> %{_libdir}/grub/%{efi_arch}/*
> %endif
>@@ -453,6 +448,7 @@
> %{_bindir}/update-grub
> %{_bindir}/update-grub2
> %{_sbindir}/%{name}-*
>+%dir %{_libdir}/grub
> %{_datarootdir}/bash-completion/completions/grub
> %{_sysconfdir}/grub.d/README
> %{_sysconfdir}/grub.d/00_header

--- grub2.spec	2017-10-07 15:14:31.573491397 -0700
+++ grub2.spec.unity	2017-10-07 15:11:58.497865472 -0700
@@ -20,7 +20,7 @@
 %global tarversion 2.02~beta3
 %global pc_arch i386-pc
 %define git	10463
-%define rel	9
+%define rel	10
 
 Name:		grub2
 Version:	2.02
@@ -103,7 +103,6 @@
 BuildRequires:	ruby
 BuildRequires:	texinfo
 
-Conflicts:	%{name}-efi
 Provides:	bootloader
 Provides:	grub2bootloader = %{version}-%{release}
 Requires:	%{name}-common = %{version}-%{release}
@@ -121,7 +120,6 @@
 Summary:	Boot-loader with support for EFI
 Group:		System/Boot and Init
 
-Conflicts:	%{name}
 Requires(post):	efibootmgr
 Provides:	bootloader
 Provides:	grub2bootloader = %{version}-%{release}
@@ -423,7 +421,6 @@
 
 %ifnarch %arm
 %files
-%dir %{_libdir}/grub
 %dir %{_libdir}/grub/i386-pc
 %{_libdir}/grub/i386-pc/*
 %endif
@@ -431,14 +428,12 @@
 %ifnarch %arm
 %files efi 
 %doc README.efi
-%dir %{_libdir}/grub
 %dir %{_libdir}/grub/%{efi_arch}
 %{_libdir}/grub/%{efi_arch}/*
 %endif
 
 %ifarch %arm
 %files uboot
-%dir %{_libdir}/grub
 %dir %{_libdir}/grub/%{efi_arch}
 %{_libdir}/grub/%{efi_arch}/*
 %endif
@@ -453,6 +448,7 @@
 %{_bindir}/update-grub
 %{_bindir}/update-grub2
 %{_sbindir}/%{name}-*
+%dir %{_libdir}/grub
 %{_datarootdir}/bash-completion/completions/grub
 %{_sysconfdir}/grub.d/README
 %{_sysconfdir}/grub.d/00_header

Actions: View | Diff

Attachments on bug 21811: 9705 | 9710