Add py3 package Conflicts for python-pygments < 2.2.0

This commit is contained in:
Steve Milner 2017-03-06 14:11:56 -05:00
parent 46f1f96711
commit 259afea88c

View File

@ -22,7 +22,7 @@
Name: python-pygments Name: python-pygments
Version: 2.2.0 Version: 2.2.0
Release: 3%{?dist} Release: 4%{?dist}
Summary: Syntax highlighting engine written in Python Summary: Syntax highlighting engine written in Python
Group: Development/Libraries Group: Development/Libraries
@ -33,8 +33,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch BuildArch: noarch
BuildRequires: python2-devel >= 2.4, python-setuptools, python-nose, python-sphinx BuildRequires: python2-devel >= 2.4, python-setuptools, python-nose, python-sphinx
%if 0%{?with_python3} %if 0%{?with_python3}
BuildRequires: python3-devel, python3-setuptools, python3-nose BuildRequires: python3-devel, python3-setuptools, python3-nose
# The binary location was moved from Python 2 to Python 3. See BZ#1429075
Conflicts: python-pygments < 2.2.0
%endif # if with_python3 %endif # if with_python3
%if 0%{?with_python26} %if 0%{?with_python26}
@ -206,6 +209,9 @@ popd
%changelog %changelog
* Mon Mar 6 2017 Steve Milner <smilner@redhat.com> - 2.2.0-4
- Added conflict per BZ#1429075
* Mon Mar 6 2017 Steve Milner <smilner@redhat.com> - 2.2.0-3 * Mon Mar 6 2017 Steve Milner <smilner@redhat.com> - 2.2.0-3
- Python3 package now houses the pygmentize binary - Python3 package now houses the pygmentize binary
- Fixed Source0 url to point to pypi.org - Fixed Source0 url to point to pypi.org