npmccallum pushed to python-ipaddress (f20). "Remove Conflcits: python-ipaddr"

[notifications at fedoraproject.org]

From f024eb65b6e3cacba08e1a69d32315af85d3ee06 Mon Sep 17 00:00:00 2001
From: Nathaniel McCallum <nathaniel at themccallums.org>
Date: Wed, 10 Jun 2015 13:33:58 -0400
Subject: Remove Conflcits: python-ipaddr


diff --git a/python-ipaddress.spec b/python-ipaddress.spec
index d6ed5bd..455d771 100644
--- a/python-ipaddress.spec
+++ b/python-ipaddress.spec
@@ -2,7 +2,7 @@
 
 Name:           python-%{pyname}
 Version:        1.0.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Port of the python 3.3+ ipaddress module to 2.6+
 
 License:        Python
@@ -11,7 +11,6 @@ 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
@@ -42,6 +41,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jun 10 2015 Nathaniel McCallum <npmccallum at redhat.com> - 1.0.7-3
+- Remove Conflicts: python-ipaddr
+
 * Mon Jun  6 2015 Nathaniel McCallum <npmccallum at redhat.com> - 1.0.7-2
 - Add Conflicts: python-ipaddr
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/python-ipaddress.git/commit/?h=f20&id=f024eb65b6e3cacba08e1a69d32315af85d3ee06