add epoch to obsoletes

This commit is contained in:
Dennis Gilmore 2013-07-02 13:20:08 -05:00
parent 9546739573
commit d0b05a7eb9

View File

@ -41,7 +41,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.00 Version: 2.00
Release: 22%{?dist} Release: 23%{?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
@ -564,7 +564,7 @@ Requires(pre): dracut
Requires(post): dracut Requires(post): dracut
ExcludeArch: s390 s390x %{arm} ExcludeArch: s390 s390x %{arm}
Obsoletes: grub2 <= 2.00-20%{?dist} Obsoletes: grub2 <= 1: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
@ -577,7 +577,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} Obsoletes: grub2-efi <= 1: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
@ -601,8 +601,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 <= 1:2.00-20%{?dist}
Obsoletes: grub2-efi <= 2.00-20%{?dist} Obsoletes: grub2-efi <= 1: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
@ -923,6 +923,9 @@ fi
%{_datarootdir}/grub/themes/ %{_datarootdir}/grub/themes/
%changelog %changelog
* Tue Jul 02 2013 Dennis Gilmore <dennis@ausil.us> - 2.00-23
- add epoch to obsoletes
* Fri Jun 21 2013 Peter Jones <pjones@redhat.com> - 2.00-22 * Fri Jun 21 2013 Peter Jones <pjones@redhat.com> - 2.00-22
- Fix linewrapping in edit menu. - Fix linewrapping in edit menu.
Resolves: rhbz #976643 Resolves: rhbz #976643