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

[Seth Vidal]

commit f8e3bd74d7938f154b0ebeed4776e3708af07039
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Aug 11 14:08: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 3a03262..d782a06 100644
--- a/epel-release.spec
+++ b/epel-release.spec
@@ -1,6 +1,6 @@
 Name:           epel-release       
 Version:        4 
-Release:        9
+Release:        10
 Summary:        Extra Packages for Enterprise Linux repository configuration
 
 Group:          System Environment/Base 
@@ -22,6 +22,7 @@ BuildArch:     noarch
 Requires:      redhat-release >=  %{version} 
 Requires(postun): perl
 Requires(post): perl
+Conflicts: fedora-release
 
 %description
 This package contains the Extra Packages for Enterprise Linux (EPEL) repository
@@ -87,6 +88,9 @@ exit 0
 
 
 %changelog
+* Wed Aug 11 2010 Seth Vidal <skvidal at fedoraproject.org> - 4-10
+- conflict fedora-release
+
 * Fri Apr 25 2008 Matt Domsch <Matt_Domsch at dell.com> - 4-9
 - fix post and postun.  postun would unconditionally remove the lines
   added by post.