From c3b2b8bc1bb58c794fb0025e87e4273a2616ce52 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Oct 11 2011 21:08:49 +0000
Subject: We don't need the conflicts with grub2 any more since grub2 has an

obsolete.

---

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@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@redhat.com> - 0.97-80
 - Separate grub-efi into a separate subpackage
   Resolves: rhbz#743376