[grub2] Fix merge error on /etc/default/grub ownership, and add IBM bug number.

Peter Jones pjones at fedoraproject.org
Fri May 11 15:41:06 UTC 2012


commit 3e73e125cdeabba94f69923967ad450e6d8681ae
Author: Peter Jones <pjones at redhat.com>
Date:   Thu May 10 18:05:33 2012 -0400

    Fix merge error on /etc/default/grub ownership, and add IBM bug number.

 grub2.spec |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/grub2.spec b/grub2.spec
index 1d1de44..c29c6f9 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -372,7 +372,7 @@ fi
 %config %{_sysconfdir}/grub.d/??_*
 %{_sysconfdir}/grub.d/README
 %config(noreplace) %{_sysconfdir}/grub2-efi.cfg
-%config(noreplace) %{_sysconfdir}/default/grub
+%ghost %config(noreplace) %{_sysconfdir}/default/grub
 %{_sysconfdir}/sysconfig/grub
 %ghost %config(noreplace) /boot/efi/EFI/redhat/grub2-efi/grub.cfg
 %doc grub-%{tarversion}/COPYING grub-%{tarversion}/INSTALL
@@ -391,7 +391,8 @@ fi
 * Thu May 10 2012 Peter Jones <pjones at redhat.com> - 2.0-0.27.beta5
 - Fix license of theme (mizmo)
   Resolves: rhbz#820713
-- Fix some unfiled IBM problem.
+- Fix some PPC bootloader detection IBM problem
+  Resolves: rhbz#820722
 
 * Thu May 10 2012 Peter Jones <pjones at redhat.com> - 2.0-0.26.beta5
 - Update to beta5.


More information about the scm-commits mailing list