rpms/grub2
7
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/grub2.git synced 2024-12-01 08:49:52 +00:00
Code Issues 24 Projects 4 Releases Packages Wiki Activity Actions

Merge commit '7c419b815b57574150081f0e99879fbf083c6286' into f16

Browse source
This commit is contained in:
Adam Williamson 2011-10-19 14:29:19 -07:00
commit 0282c8c3a8
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
grub2.spec
View file

@ -18,7 +18,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 1.99 Version: 1.99
Release: 9%{?dist} Release: 10%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
Group: System Environment/Base Group: System Environment/Base
@ -292,7 +292,7 @@ fi
%config %{_sysconfdir}/grub.d/??_* %config %{_sysconfdir}/grub.d/??_*
%{_sysconfdir}/grub.d/README %{_sysconfdir}/grub.d/README
%{_sysconfdir}/%{name}.cfg %{_sysconfdir}/%{name}.cfg
%{_sysconfdir}/default/grub %config(noreplace) %{_sysconfdir}/default/grub
%dir /boot/%{name} %dir /boot/%{name}
# Actually, this is replaced by update-grub from scriptlets, # Actually, this is replaced by update-grub from scriptlets,
# but it takes care of modified persistent part # but it takes care of modified persistent part
@ -341,7 +341,7 @@ fi
%config %{_sysconfdir}/grub.d/??_* %config %{_sysconfdir}/grub.d/??_*
%{_sysconfdir}/grub.d/README %{_sysconfdir}/grub.d/README
%{_sysconfdir}/grub2-efi.cfg %{_sysconfdir}/grub2-efi.cfg
%{_sysconfdir}/default/grub %config(noreplace) %{_sysconfdir}/default/grub
%dir /boot/grub2-efi %dir /boot/grub2-efi
# Actually, this is replaced by update-grub from scriptlets, # Actually, this is replaced by update-grub from scriptlets,
# but it takes care of modified persistent part # but it takes care of modified persistent part
@ -354,6 +354,10 @@ fi
%endif %endif
%changelog %changelog
* Wed Oct 19 2011 Adam Williamson <awilliam@redhat.com> - 1.99-10
- /etc/default/grub is explicitly intended for user customization, so
mark it as config(noreplace)
* Tue Oct 11 2011 Peter Jones <pjones@redhat.com> - 1.99-9 * Tue Oct 11 2011 Peter Jones <pjones@redhat.com> - 1.99-9
- grub has an epoch, so we need that expressed in the obsolete as well. - grub has an epoch, so we need that expressed in the obsolete as well.
Today isn't my day. Today isn't my day.