Fix obsoletes to pull in -starfield-theme subpackage when it should.

This commit is contained in:
Peter Jones 2013-06-20 13:30:09 -04:00
parent ab71b4de23
commit 9c5e36d017

View File

@ -41,7 +41,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.00 Version: 2.00
Release: 20%{?dist} Release: 21%{?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
@ -563,6 +563,7 @@ Requires(pre): dracut
Requires(post): dracut Requires(post): dracut
ExcludeArch: s390 s390x %{arm} ExcludeArch: s390 s390x %{arm}
Obsoletes: grub2 <= 2.00-20%{?dist}
%description %description
The GRand Unified Bootloader (GRUB) is a highly configurable and customizable The GRand Unified Bootloader (GRUB) is a highly configurable and customizable
@ -575,6 +576,7 @@ provides support for PC BIOS systems.
Summary: GRUB for EFI systems. Summary: GRUB for EFI systems.
Group: System Environment/Base Group: System Environment/Base
Requires: %{name}-tools = %{epoch}:%{version}-%{release} Requires: %{name}-tools = %{epoch}:%{version}-%{release}
Obsoletes: grub2-efi <= 2.00-20%{?dist}
%description efi %description efi
The GRand Unified Bootloader (GRUB) is a highly configurable and customizable The GRand Unified Bootloader (GRUB) is a highly configurable and customizable
@ -598,6 +600,8 @@ provides tools for support of all platforms.
Summary: An example theme for GRUB. Summary: An example theme for GRUB.
Group: System Environment/Base Group: System Environment/Base
Requires: system-logos Requires: system-logos
Obsoletes: grub2 <= 2.00-20%{?dist}
Obsoletes: grub2-efi <= 2.00-20%{?dist}
%description starfield-theme %description starfield-theme
The GRand Unified Bootloader (GRUB) is a highly configurable and customizable The GRand Unified Bootloader (GRUB) is a highly configurable and customizable
@ -918,6 +922,9 @@ fi
%{_datarootdir}/grub/themes/ %{_datarootdir}/grub/themes/
%changelog %changelog
* Thu Jun 20 2013 Peter Jones <pjones@redhat.com> - 2.00-21
- Fix obsoletes to pull in -starfield-theme subpackage when it should.
* Fri Jun 14 2013 Peter Jones <pjones@redhat.com> - 2.00-20 * Fri Jun 14 2013 Peter Jones <pjones@redhat.com> - 2.00-20
- Put the theme entirely ento the subpackage where it belongs (#974667) - Put the theme entirely ento the subpackage where it belongs (#974667)