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

Merge branch 'master' of ssh://pkgs.fedoraproject.org/grub2

Browse source 
Conflicts:
	grub2.spec
This commit is contained in:
Peter Jones 2012-03-07 09:12:41 -05:00
commit 06628ab459
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
grub2.spec
View file

@ -18,7 +18,11 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 1.99 Version: 1.99
<<<<<<< HEAD
Release: 17%{?dist} Release: 17%{?dist}
=======
Release: 16%{?dist}
>>>>>>> 1a635d813d926deec0473bd906f46b1fbcb2e0b8
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
@ -376,8 +380,6 @@ fi
* Tue Mar 06 2012 Peter Jones <pjones@redhat.com> - 1.99-17 * Tue Mar 06 2012 Peter Jones <pjones@redhat.com> - 1.99-17
- Add /etc/sysconfig/grub link to /etc/default/grub - Add /etc/sysconfig/grub link to /etc/default/grub
Resolves: rhbz#800152 Resolves: rhbz#800152
* Tue Mar 06 2012 Peter Jones <pjones@redhat.com> - 1.99-16
- ExcludeArch s390*, which is not supported by this package. - ExcludeArch s390*, which is not supported by this package.
Resolves: rhbz#758333 Resolves: rhbz#758333