From 259afea88cf407ac1e3d0dba7860dc9a3d25331b Mon Sep 17 00:00:00 2001 From: Steve Milner Date: Mon, 6 Mar 2017 14:11:56 -0500 Subject: [PATCH] Add py3 package Conflicts for python-pygments < 2.2.0 --- python-pygments.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/python-pygments.spec b/python-pygments.spec index 79579f0..14926cb 100644 --- a/python-pygments.spec +++ b/python-pygments.spec @@ -22,7 +22,7 @@ Name: python-pygments Version: 2.2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Syntax highlighting engine written in Python Group: Development/Libraries @@ -33,8 +33,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python2-devel >= 2.4, python-setuptools, python-nose, python-sphinx + %if 0%{?with_python3} 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 %if 0%{?with_python26} @@ -206,6 +209,9 @@ popd %changelog +* Mon Mar 6 2017 Steve Milner - 2.2.0-4 +- Added conflict per BZ#1429075 + * Mon Mar 6 2017 Steve Milner - 2.2.0-3 - Python3 package now houses the pygmentize binary - Fixed Source0 url to point to pypi.org