From 18cf3ef0f09256786fc718f077124c565f241a24 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Tue, 16 Sep 2014 11:50:20 -0400
Subject: [PATCH] Fix Conflicts

---
 python-qrcode.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/python-qrcode.spec b/python-qrcode.spec
index 834d259..fe05eb2 100644
--- a/python-qrcode.spec
+++ b/python-qrcode.spec
@@ -2,7 +2,7 @@
 
 Name:           python-%{pkgname}
 Version:        5.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python QR Code image generator
 
 License:        BSD
@@ -24,6 +24,7 @@ generation of QR Codes.
 
 %package core
 Requires:       python-six
+Conflicts:      python-qrcode < 5.0
 Summary:        Python QR Code image generator (core library)
 
 %description core
@@ -83,6 +84,9 @@ done
 
 
 %changelog
+* Tue Sep 16 2014 Nathaniel McCallum <npmccallum@redhat.com> - 5.0.1-2
+- Make python-qrcode-core conflicts with python-qrcode < 5.0
+
 * Wed Sep 10 2014 Nathaniel McCallum <npmccallum@redhat.com> - 5.0.1-1
 - Update to 5.0.1