Change our conflicts on python-SocksiPy to an obsoletes/provides. #1334407

This commit is contained in:
Ralph Bean 2016-07-15 13:39:02 -04:00
parent 1309dd8d29
commit 253de20300

View File

@ -16,7 +16,7 @@
Name: python-pysocks
Version: 1.5.6
Release: 3%{?dist}
Release: 4%{?dist}
Summary: %{sum}
License: BSD
@ -47,8 +47,10 @@ Summary: %{sum}
%{?python_provide:%python_provide python2-%{flatname}}
# https://bugzilla.redhat.com/show_bug.cgi?id=1334407
Conflicts: python-SocksiPy
Conflicts: python2-SocksiPy
Obsoletes: python-SocksiPy
Obsoletes: python2-SocksiPy
Provides: python-SocksiPy
Provides: python2-SocksiPy
%description -n python2-%{flatname}
A fork of SocksiPy with bug fixes and extra features.
@ -130,6 +132,10 @@ Acts as a drop-in replacement to the socket module. Featuring:
%changelog
* Fri Jul 15 2016 Ralph Bean <rbean@redhat.com> - 1.5.6-4
- Change our conflicts on python-SocksiPy to an obsoletes/provides.
https://bugzilla.redhat.com/show_bug.cgi?id=1334407
* Mon May 09 2016 Ralph Bean <rbean@redhat.com> - 1.5.6-3
- Fix typo in explicit conflicts.