[grub2] don't list grub-mkconfig_lib twice

Peter Jones pjones at fedoraproject.org
Mon Apr 16 16:40:53 UTC 2012


commit 4f57b17a983189db627b615a91eee3fef2ac86c0
Author: Mads Kiilerich <mads at kiilerich.com>
Date:   Thu Apr 5 02:19:01 2012 +0200

    don't list grub-mkconfig_lib twice
    
    /usr/share/grub/ was also listed an extra time if efi was disabled.

 grub2.spec |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/grub2.spec b/grub2.spec
index d11aac4..f2f15d7 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -287,7 +287,7 @@ fi
 %defattr(-,root,root,-)
 /etc/bash_completion.d/grub
 %{_libdir}/grub/*-%{platform}/
-%{_datarootdir}/grub/grub-mkconfig_lib
+%{_datarootdir}/grub/
 /sbin/%{name}-mkconfig
 /sbin/%{name}-mknetdir
 /sbin/%{name}-install
@@ -330,7 +330,6 @@ fi
 %doc grub-%{tarversion}/ChangeLog grub-%{tarversion}/README.Fedora
 %exclude %{_mandir}
 %{_infodir}/grub2*
-%attr(0755,root,root)/%{_datarootdir}/grub/
 
 %ifarch %{efi}
 %files efi
@@ -338,7 +337,7 @@ fi
 %attr(0755,root,root)/boot/efi/EFI/redhat
 /etc/bash_completion.d/grub-efi
 %{_libdir}/grub/%{_arch}-efi
-%{_datarootdir}/grub/grub-mkconfig_lib
+%{_datarootdir}/grub/
 /sbin/grub2-efi-mkconfig
 /sbin/grub2-efi-mknetdir
 /sbin/grub2-efi-install
@@ -381,7 +380,6 @@ fi
 %exclude %{_mandir}
 %{_infodir}/grub2*
 %endif
-%attr(0755,root,root)/%{_datarootdir}/grub/
 
 %changelog
 * Thu Mar 29 2012 Peter Jones <pjones at redhat.com> - 2.0-0.21


More information about the scm-commits mailing list