Re-synchronize master and f27

There's really no need for them to diverge yet.
This commit is contained in:
Adam Williamson 2017-09-11 10:01:54 -07:00
commit af2933aadd
2 changed files with 5 additions and 2 deletions

View File

@ -171,7 +171,7 @@
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 \
Provides: %{name} = %{evr} \ Provides: %{name} = %{evr} \
Obsoletes: %{name} < 1:2.02-0 \ Obsoletes: %{name} < %{evr} \
Requires: %{name}-common = %{evr} \ Requires: %{name}-common = %{evr} \
Requires: %{name}-tools-minimal = %{evr} \ Requires: %{name}-tools-minimal = %{evr} \
Requires: %{name}-%{1}-modules = %{evr} \ Requires: %{name}-%{1}-modules = %{evr} \

View File

@ -7,7 +7,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.02 Version: 2.02
Release: 15%{?dist} Release: 16%{?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+
@ -454,6 +454,9 @@ fi
%endif %endif
%changelog %changelog
* Wed Sep 06 2017 Peter Jones <pjones@redhat.com> - 2.02-16
- Fix Obsoletes on grub2-pc
* Wed Aug 30 2017 Petr Šabata <contyk@redhat.com> - 2.02-15 * Wed Aug 30 2017 Petr Šabata <contyk@redhat.com> - 2.02-15
- Limit the pattern matching in do_alt_efi_install to files to - Limit the pattern matching in do_alt_efi_install to files to
unbreak module builds unbreak module builds