npmccallum pushed to python-ipaddress (master). "Add Conflicts: python-ipaddr"

[notifications at fedoraproject.org]

From 35c4316c7b430733dc001bec56ddc21718a3dcce Mon Sep 17 00:00:00 2001
From: Nathaniel McCallum <nathaniel at themccallums.org>
Date: Mon, 8 Jun 2015 12:51:13 -0400
Subject: Add Conflicts: python-ipaddr


diff --git a/python-ipaddress.spec b/python-ipaddress.spec
index 3a84f78..d6ed5bd 100644
--- a/python-ipaddress.spec
+++ b/python-ipaddress.spec
@@ -2,7 +2,7 @@
 
 Name:           python-%{pyname}
 Version:        1.0.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Port of the python 3.3+ ipaddress module to 2.6+
 
 License:        Python
@@ -11,6 +11,7 @@ Source0:        https://pypi.python.org/packages/source/i/%{pyname}/%{pyname}-1.
 
 BuildArch:      noarch
 BuildRequires:  python2-devel
+Conflicts:      python-ipaddr
 
 %description
 ipaddress provides the capabilities to create, manipulate and operate
@@ -41,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jun  6 2015 Nathaniel McCallum <npmccallum at redhat.com> - 1.0.7-2
+- Add Conflicts: python-ipaddr
+
 * Thu May 14 2015 Nathaniel McCallum <npmccallum at redhat.com> - 1.0.7-1
 - Update to 1.0.7
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/python-ipaddress.git/commit/?h=master&id=35c4316c7b430733dc001bec56ddc21718a3dcce