[epel-release/el5/master] conflict fedora-release

[Seth Vidal]

commit 68f04b65a432c02e2d175311600dd48599b43187
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Aug 11 14:03:22 2010 -0400

    conflict fedora-release

 epel-release.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/epel-release.spec b/epel-release.spec
index f8de244..1408d90 100644
--- a/epel-release.spec
+++ b/epel-release.spec
@@ -1,6 +1,6 @@
 Name:           epel-release       
 Version:        5 
-Release:        3
+Release:        4
 Summary:        Extra Packages for Enterprise Linux repository configuration
 
 Group:          System Environment/Base 
@@ -20,6 +20,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:     noarch
 Requires:      redhat-release >=  %{version} 
+Conflicts:     fedora-release
 
 %description
 This package contains the Extra Packages for Enterprise Linux (EPEL) repository
@@ -56,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 10 2010 Seth Vidal <skvidal at fedoraproject.org> - 5-4
+- conflict fedora-release so people don't indadvertently do something silly
+
 * Fri Apr 25 2008 Matt Domsch <Matt_Domsch at dell.com> - 5-3
 - use mirrorlists in epel-testing.repo
 - use download.fedoraproject.org in (commented out) baseurls