[bootconf] Fix dependencies

[Sam Varshavchik]

commit 27afbd69758fb12ed1eb54e0285c3d988a82af72
Author: Sam Varshavchik <mrsam at courier-mta.com>
Date:   Sat Nov 26 15:24:26 2011 -0500

    Fix dependencies

 bootconf.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/bootconf.spec b/bootconf.spec
index f61ccdb..837a3a6 100644
--- a/bootconf.spec
+++ b/bootconf.spec
@@ -3,7 +3,7 @@
 Summary: GRUB configuration utility
 Name: bootconf
 Version: 1.4
-Release: 3%{dist}
+Release: 4%{dist}
 License: GPLv3
 Group: System Environment/Base
 Url: http://www.courier-mta.org/bootconf/
@@ -11,7 +11,7 @@ Source0: http://www.courier-mta.org/bootconf/download/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 BuildRequires: desktop-file-utils
-Conflicts: grub2
+Requires: grub
 
 %description
 The bootconf configuration utility is a convenient tool for setting
@@ -79,6 +79,9 @@ desktop-file-install --vendor="fedora" \
 %{_datadir}/applications/*
 
 %changelog
+* Sat Nov 26 2011 Sam Varshavchik <mrsam at monster.email-scan.com> - 1.4-4
+- Instead of conflicting with grub2, require grub.
+
 * Wed Nov 16 2011 Sam Varshavchik <mrsam at monster.email-scan.com> - 1.4-3%{dist}
 - bootconf-gui requires gnome-python2-gnome. Conflicts with grub2 (F16+).