Attachment 9705 Details for Bug 21811 – Patch to spec to fix conflcits

[patch] Patch to spec to fix conflcits

fix_grub2_conflicts.patch (text/plain), 911 bytes, created by Jeremiah Summers on 2017-10-07 00:48:24 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremiah Summers

Created: 2017-10-07 00:48:24 CEST

Size: 911 bytes

patch

obsolete

--- grub2.spec	2017-10-06 15:43:37.439939528 -0700
+++ grub2.spec.awesome	2017-10-06 11:37:22.358171197 -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
@@ -423,7 +423,6 @@
 
 %ifnarch %arm
 %files
-%dir %{_libdir}/grub
 %dir %{_libdir}/grub/i386-pc
 %{_libdir}/grub/i386-pc/*
 %endif
@@ -431,14 +430,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 +450,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