mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 14:32:58 +00:00
Merge commit '328405c9f5f69dd1f41d5c0a742ad64bd19698de'
Conflicts: grub2.spec
This commit is contained in:
commit
a9b3287b03
1 changed files with 13 additions and 1 deletions
14
grub2.spec
14
grub2.spec
|
@ -18,12 +18,13 @@
|
||||||
Name: grub2
|
Name: grub2
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 1.99
|
Version: 1.99
|
||||||
Release: 6%{?dist}
|
Release: 9%{?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
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
URL: http://www.gnu.org/software/grub/
|
URL: http://www.gnu.org/software/grub/
|
||||||
|
Obsoletes: grub < 1:0.98
|
||||||
Source0: ftp://ftp.gnu.org/gnu/grub/grub-%{version}.tar.xz
|
Source0: ftp://ftp.gnu.org/gnu/grub/grub-%{version}.tar.xz
|
||||||
Source1: 90_persistent
|
Source1: 90_persistent
|
||||||
Source2: grub.default
|
Source2: grub.default
|
||||||
|
@ -353,6 +354,17 @@ fi
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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.
|
||||||
|
Today isn't my day.
|
||||||
|
|
||||||
|
* Tue Oct 11 2011 Peter Jones <pjones@redhat.com> - 1.99-8
|
||||||
|
- Fix my bad obsoletes syntax.
|
||||||
|
|
||||||
|
* Thu Oct 06 2011 Peter Jones <pjones@redhat.com> - 1.99-7
|
||||||
|
- Obsolete grub
|
||||||
|
Resolves: rhbz#743381
|
||||||
|
|
||||||
* Wed Sep 14 2011 Peter Jones <pjones@redhat.com> - 1.99-6
|
* Wed Sep 14 2011 Peter Jones <pjones@redhat.com> - 1.99-6
|
||||||
- Use mv not cp to try to avoid moving disk blocks around for -5 fix
|
- Use mv not cp to try to avoid moving disk blocks around for -5 fix
|
||||||
Related: rhbz#735259
|
Related: rhbz#735259
|
||||||
|
|
Loading…
Reference in a new issue