[grub/f16] We don't need the conflicts with grub2 any more since grub2 has an obsolete.
Peter Jones
pjones at fedoraproject.org
Tue Oct 11 21:08:53 UTC 2011
commit c3b2b8bc1bb58c794fb0025e87e4273a2616ce52
Author: Peter Jones <pjones at redhat.com>
Date: Tue Oct 11 17:08:49 2011 -0400
We don't need the conflicts with grub2 any more since grub2 has an
obsolete.
grub.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/grub.spec b/grub.spec
index 38e2e77..e36f1a9 100644
--- a/grub.spec
+++ b/grub.spec
@@ -1,6 +1,6 @@
Name: grub
Version: 0.97
-Release: 80%{?dist}
+Release: 81%{?dist}
Epoch: 1
Summary: Grand Unified Boot Loader.
Group: System Environment/Base
@@ -17,7 +17,6 @@ Requires(preun): /sbin/install-info
Requires: mktemp
Requires: system-logos
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Conflicts: grub2
URL: http://www.gnu.org/software/%{name}/
Source0: ftp://alpha.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
@@ -120,6 +119,10 @@ fi
/sbin/grub-crypt
%changelog
+* Tue Oct 11 2011 Peter Jones <pjones at redhat.com> - 0.97-81
+- We don't need the conflicts with grub2 any more since grub2 has an
+ obsolete.
+
* Tue Oct 04 2011 Peter Jones <pjones at redhat.com> - 0.97-80
- Separate grub-efi into a separate subpackage
Resolves: rhbz#743376
More information about the scm-commits
mailing list