.gitignore

@@ -1 +1 @@
-SOURCES/Pygments-2.7.4-clean.tar.xz
+SOURCES/Pygments-2.2.0.tar.gz

.python-pygments.metadata

@@ -1 +1 @@
-39403d12cda98e0dfd0a9e680b59d508cef1ed2c SOURCES/Pygments-2.7.4-clean.tar.xz
+5c6714bd6fd950c1478889f7b72fc7f6771d5163 SOURCES/Pygments-2.2.0.tar.gz

SOURCES/CVE-2021-20270-infinite-loop-in-SML-lexer.patch

@@ -0,0 +1,33 @@
+diff --git a/pygments/lexers/ml.py b/pygments/lexers/ml.py
+index f80d5bf..4fd2c58 100644
+--- a/pygments/lexers/ml.py
++++ b/pygments/lexers/ml.py
+@@ -142,7 +142,7 @@ class SMLLexer(RegexLexer):
+             (r'#\s+(%s)' % symbolicid_re, Name.Label),
+             # Some reserved words trigger a special, local lexer state change
+             (r'\b(datatype|abstype)\b(?!\')', Keyword.Reserved, 'dname'),
+-            (r'(?=\b(exception)\b(?!\'))', Text, ('ename')),
++            (r'\b(exception)\b(?!\')', Keyword.Reserved, 'ename'),
+             (r'\b(functor|include|open|signature|structure)\b(?!\')',
+              Keyword.Reserved, 'sname'),
+             (r'\b(type|eqtype)\b(?!\')', Keyword.Reserved, 'tname'),
+@@ -315,15 +315,14 @@ class SMLLexer(RegexLexer):
+         'ename': [
+             include('whitespace'),
+ 
+-            (r'(exception|and)\b(\s+)(%s)' % alphanumid_re,
++            (r'(and\b)(\s+)(%s)' % alphanumid_re,
+              bygroups(Keyword.Reserved, Text, Name.Class)),
+-            (r'(exception|and)\b(\s*)(%s)' % symbolicid_re,
++            (r'(and\b)(\s*)(%s)' % symbolicid_re,
+              bygroups(Keyword.Reserved, Text, Name.Class)),
+             (r'\b(of)\b(?!\')', Keyword.Reserved),
++            (r'(%s)|(%s)' % (alphanumid_re, symbolicid_re), Name.Class),
+ 
+-            include('breakout'),
+-            include('core'),
+-            (r'\S+', Error),
++            default('#pop'),
+         ],
+ 
+         'datcon': [

SOURCES/CVE-2021-27291.patch

@@ -0,0 +1,140 @@
+From 179281dfed46f26d3fcc76d0600ee6728a7e493c Mon Sep 17 00:00:00 2001
+From: Lumir Balhar <lbalhar@redhat.com>
+Date: Thu, 22 Apr 2021 13:39:00 +0200
+Subject: [PATCH] CVE-2021-27291
+
+---
+ pygments/lexers/archetype.py | 2 +-
+ pygments/lexers/factor.py    | 4 ++--
+ pygments/lexers/jvm.py       | 1 -
+ pygments/lexers/matlab.py    | 6 +++---
+ pygments/lexers/objective.py | 4 ++--
+ pygments/lexers/templates.py | 2 +-
+ pygments/lexers/varnish.py   | 2 +-
+ 7 files changed, 10 insertions(+), 11 deletions(-)
+
+diff --git a/pygments/lexers/archetype.py b/pygments/lexers/archetype.py
+index 5d4eb9a..82f3b12 100644
+--- a/pygments/lexers/archetype.py
++++ b/pygments/lexers/archetype.py
+@@ -58,7 +58,7 @@ class AtomsLexer(RegexLexer):
+             (r'P((\d*(\.\d+)?[YyMmWwDd]){1,3}(T(\d*(\.\d+)?[HhMmSs]){,3})?|'
+              r'T(\d*(\.\d+)?[HhMmSs]){,3})', Literal.Date),
+             (r'[+-]?(\d+\.\d*|\.\d+|\d+)[eE][+-]?\d+', Number.Float),
+-            (r'[+-]?(\d+)*\.\d+%?', Number.Float),
++            (r'[+-]?\d*\.\d+%?', Number.Float),
+             (r'0x[0-9a-fA-F]+', Number.Hex),
+             (r'[+-]?\d+%?', Number.Integer),
+         ],
+diff --git a/pygments/lexers/factor.py b/pygments/lexers/factor.py
+index 09d85c2..7eb3993 100644
+--- a/pygments/lexers/factor.py
++++ b/pygments/lexers/factor.py
+@@ -265,7 +265,7 @@ class FactorLexer(RegexLexer):
+             (r'(?:<PRIVATE|PRIVATE>)\s', Keyword.Namespace),
+ 
+             # strings
+-            (r'"""\s+(?:.|\n)*?\s+"""', String),
++            (r'"""\s(?:.|\n)*?\s"""', String),
+             (r'"(?:\\\\|\\"|[^"])*"', String),
+             (r'\S+"\s+(?:\\\\|\\"|[^"])*"', String),
+             (r'CHAR:\s+(?:\\[\\abfnrstv]|[^\\]\S*)\s', String.Char),
+@@ -322,7 +322,7 @@ class FactorLexer(RegexLexer):
+         'slots': [
+             (r'\s+', Text),
+             (r';\s', Keyword, '#pop'),
+-            (r'(\{\s+)(\S+)(\s+[^}]+\s+\}\s)',
++            (r'(\{\s+)(\S+)(\s[^}]+\s\}\s)',
+              bygroups(Text, Name.Variable, Text)),
+             (r'\S+', Name.Variable),
+         ],
+diff --git a/pygments/lexers/jvm.py b/pygments/lexers/jvm.py
+index f439283..668eed7 100644
+--- a/pygments/lexers/jvm.py
++++ b/pygments/lexers/jvm.py
+@@ -963,7 +963,6 @@ class CeylonLexer(RegexLexer):
+             (r'(import)(\s+)', bygroups(Keyword.Namespace, Text), 'import'),
+             (r'"(\\\\|\\"|[^"])*"', String),
+             (r"'\\.'|'[^\\]'|'\\\{#[0-9a-fA-F]{4}\}'", String.Char),
+-            (r'".*``.*``.*"', String.Interpol),
+             (r'(\.)([a-z_]\w*)',
+              bygroups(Operator, Name.Attribute)),
+             (r'[a-zA-Z_]\w*:', Name.Label),
+diff --git a/pygments/lexers/matlab.py b/pygments/lexers/matlab.py
+index 56a0f6d..abfb9f0 100644
+--- a/pygments/lexers/matlab.py
++++ b/pygments/lexers/matlab.py
+@@ -124,7 +124,7 @@ class MatlabLexer(RegexLexer):
+             (r'.', Comment.Multiline),
+         ],
+         'deffunc': [
+-            (r'(\s*)(?:(.+)(\s*)(=)(\s*))?(.+)(\()(.*)(\))(\s*)',
++            (r'(\s*)(?:(\S+)(\s*)(=)(\s*))?(.+)(\()(.*)(\))(\s*)',
+              bygroups(Whitespace, Text, Whitespace, Punctuation,
+                       Whitespace, Name.Function, Punctuation, Text,
+                       Punctuation, Whitespace), '#pop'),
+@@ -585,7 +585,7 @@ class OctaveLexer(RegexLexer):
+             (r"[^']*'", String, '#pop'),
+         ],
+         'deffunc': [
+-            (r'(\s*)(?:(.+)(\s*)(=)(\s*))?(.+)(\()(.*)(\))(\s*)',
++            (r'(\s*)(?:(\S+)(\s*)(=)(\s*))?(.+)(\()(.*)(\))(\s*)',
+              bygroups(Whitespace, Text, Whitespace, Punctuation,
+                       Whitespace, Name.Function, Punctuation, Text,
+                       Punctuation, Whitespace), '#pop'),
+@@ -653,7 +653,7 @@ class ScilabLexer(RegexLexer):
+             (r'.', String, '#pop'),
+         ],
+         'deffunc': [
+-            (r'(\s*)(?:(.+)(\s*)(=)(\s*))?(.+)(\()(.*)(\))(\s*)',
++            (r'(\s*)(?:(\S+)(\s*)(=)(\s*))?(.+)(\()(.*)(\))(\s*)',
+              bygroups(Whitespace, Text, Whitespace, Punctuation,
+                       Whitespace, Name.Function, Punctuation, Text,
+                       Punctuation, Whitespace), '#pop'),
+diff --git a/pygments/lexers/objective.py b/pygments/lexers/objective.py
+index 7807255..e4b9f1e 100644
+--- a/pygments/lexers/objective.py
++++ b/pygments/lexers/objective.py
+@@ -261,11 +261,11 @@ class LogosLexer(ObjectiveCppLexer):
+              'logos_classname'),
+             (r'(%hook|%group)(\s+)([a-zA-Z$_][\w$]+)',
+              bygroups(Keyword, Text, Name.Class)),
+-            (r'(%config)(\s*\(\s*)(\w+)(\s*=\s*)(.*?)(\s*\)\s*)',
++            (r'(%config)(\s*\(\s*)(\w+)(\s*=)(.*?)(\)\s*)',
+              bygroups(Keyword, Text, Name.Variable, Text, String, Text)),
+             (r'(%ctor)(\s*)(\{)', bygroups(Keyword, Text, Punctuation),
+              'function'),
+-            (r'(%new)(\s*)(\()(\s*.*?\s*)(\))',
++            (r'(%new)(\s*)(\()(.*?)(\))',
+              bygroups(Keyword, Text, Keyword, String, Keyword)),
+             (r'(\s*)(%end)(\s*)', bygroups(Text, Keyword, Text)),
+             inherit,
+diff --git a/pygments/lexers/templates.py b/pygments/lexers/templates.py
+index 83c57db..066dad7 100644
+--- a/pygments/lexers/templates.py
++++ b/pygments/lexers/templates.py
+@@ -1428,7 +1428,7 @@ class EvoqueLexer(RegexLexer):
+             # see doc for handling first name arg: /directives/evoque/
+             # + minor inconsistency: the "name" in e.g. $overlay{name=site_base}
+             # should be using(PythonLexer), not passed out as String
+-            (r'(\$)(evoque|overlay)(\{(%)?)(\s*[#\w\-"\'.]+[^=,%}]+?)?'
++            (r'(\$)(evoque|overlay)(\{(%)?)(\s*[#\w\-"\'.]+)?'
+              r'(.*?)((?(4)%)\})',
+              bygroups(Punctuation, Name.Builtin, Punctuation, None,
+                       String, using(PythonLexer), Punctuation)),
+diff --git a/pygments/lexers/varnish.py b/pygments/lexers/varnish.py
+index 4452142..f4c9a88 100644
+--- a/pygments/lexers/varnish.py
++++ b/pygments/lexers/varnish.py
+@@ -61,7 +61,7 @@ class VCLLexer(RegexLexer):
+              bygroups(Name.Attribute, Operator, Name.Variable.Global, Punctuation)),
+             (r'(\.probe)(\s*=\s*)(\{)',
+              bygroups(Name.Attribute, Operator, Punctuation), 'probe'),
+-            (r'(\.\w+\b)(\s*=\s*)([^;]*)(\s*;)',
++            (r'(\.\w+\b)(\s*=\s*)([^;\s]*)(\s*;)',
+              bygroups(Name.Attribute, Operator, using(this), Punctuation)),
+             (r'\{', Punctuation, '#push'),
+             (r'\}', Punctuation, '#pop'),
+-- 
+2.30.2
+

SOURCES/get-clean-tarball.sh

@@ -1,26 +0,0 @@
-#! /bin/bash -ex
-
-# You can set the version as an argument to the script,
-# default is taken from the specfile
-if [ "$1" = "" ]; then
-    VERSION=$(
-        rpm -q --qf "%{VERSION}\n" --specfile python-pygments.spec | head -n1
-    )
-else
-    VERSION=$1
-fi
-
-SRCURL=https://files.pythonhosted.org/packages/source/P/Pygments/Pygments-$VERSION.tar.gz
-BADFILE=Pygments-$VERSION/tests/examplefiles/Intro.java
-OUT=Pygments-$VERSION-clean.tar.xz
-
-curl -L $SRCURL |
-    gunzip |
-    tar --delete $BADFILE --delete $BADFILE.output |
-    xz > $OUT
-
-if tar tJf $OUT | grep 'Intro.java'; then
-    >&2 echo "Intro.java left in!"
-    mv $OUT $OUT.bad
-    exit 1
-fi

SOURCES/import-directive.patch

@@ -0,0 +1,12 @@
+diff -ur Pygments-2.2.0/pygments/sphinxext.py Pygments-2.2.0.patch/pygments/sphinxext.py
+--- Pygments-2.2.0/pygments/sphinxext.py	2017-01-22 16:01:32.000000000 -0500
++++ Pygments-2.2.0.patch/pygments/sphinxext.py	2018-03-19 12:57:52.099927570 -0400
+@@ -16,7 +16,7 @@
+ 
+ from docutils import nodes
+ from docutils.statemachine import ViewList
+-from sphinx.util.compat import Directive
++from docutils.parsers.rst import Directive
+ from sphinx.util.nodes import nested_parse_with_titles
+ 
+ 

SPECS/python-pygments.spec

@@ -1,25 +1,48 @@
-# when bootstrapping, we cannot yet use sphinx and pytest
+%global debug_package %{nil}
-%bcond_without docs
+# python2X and python3X are built form the same module, so we need a conditional
+# for python[23] bits the state of the conditional is not important in the spec,
+# it is set in modulemd
+%bcond_without python2
+%bcond_without python3
+%bcond_with python36_module
+
+%if %{without python3}
+%bcond_with doc
+%else
+%bcond_without doc
+%endif
+
 %bcond_without tests
 
+%global upstream_name Pygments
+%global srcname pygments
+%global sum Syntax highlighting engine written in Python
+
 Name:           python-pygments
-Version:        2.7.4
+Version:        2.2.0
-Release:        4%{?dist}
+Release:        22%{?dist}
-Summary:        Syntax highlighting engine written in Python
+Summary:        %{sum}
 
 License:        BSD
-URL:            https://pygments.org/
+URL:            http://pygments.org/
+Source0:        https://pypi.org/packages/source/P/%{upstream_name}/%{upstream_name}-%{version}.tar.gz
+Patch0:         import-directive.patch
+BuildArch:      noarch
 
-# One of the examples has a questionable licence clause, see:
+# Fix CVE-2021-20270: infinite loop in SML lexer which may lead to DoS
-#   https://github.com/pygments/pygments/issues/1831
+# Resolved upstream: https://github.com/pygments/pygments/commit/f91804ff4772e3ab41f46e28d370f57898700333
-# To obtain a cleaned-up tarball, run:
+Patch1:         CVE-2021-20270-infinite-loop-in-SML-lexer.patch
-#   $ ./get-clean-tarball.sh
-Source0:        Pygments-%{version}-clean.tar.xz
-Source1:        get-clean-tarball.sh
 
-BuildArch:      noarch
+# CVE-2021-27291: ReDos via crafted malicious input
+# Tracking bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2021-27291
+# Upstream fix: https://github.com/pygments/pygments/commit/2e7e8c4a7b318f4032493773732754e418279a14
+Patch2:         CVE-2021-27291.patch
+
+%if %{with python3}
+BuildRequires:  python3-sphinx
+%endif
 
-%global _description %{expand:
+%description
 Pygments is a generic syntax highlighter for general use in all kinds
 of software such as forum systems, wikis or other applications that
 need to prettify source code. Highlights are:
@@ -32,142 +55,171 @@ need to prettify source code. Highlights are:
   * a number of output formats is available, among them HTML, RTF,
     LaTeX and ANSI sequences
   * it is usable as a command-line tool and as a library
-  * ... and it highlights even Brainf*ck!}
+  * ... and it highlights even Brainf*ck!
 
-%description %_description
 
-%package -n python%{python3_pkgversion}-pygments
+%if %{with python2}
-BuildRequires:  python%{python3_pkgversion}-devel
+%package -n python2-%{srcname}
-BuildRequires:  pyproject-rpm-macros
+BuildRequires:  python2-devel >= 2.4
-%if %{with tests}
+BuildRequires:  python2-setuptools
-BuildRequires:  make
+BuildRequires:  python2-nose
-BuildRequires:  python%{python3_pkgversion}-pytest
+Summary:        %{sum}
+%{?python_provide:%python_provide python2-%{srcname}}
+
+%description -n python2-%{srcname}
+Pygments is a generic syntax highlighter for general use in all kinds
+of software such as forum systems, wikis or other applications that
+need to prettify source code. Highlights are:
+
+  * a wide range of common languages and markup formats is supported
+  * special attention is paid to details that increase highlighting
+    quality
+  * support for new languages and formats are added easily; most
+    languages use a simple regex-based lexing mechanism
+  * a number of output formats is available, among them HTML, RTF,
+    LaTeX and ANSI sequences
+  * it is usable as a command-line tool and as a library
+  * ... and it highlights even Brainf*ck!
 %endif
-%if %{with docs}
+
-BuildRequires:  python%{python3_pkgversion}-sphinx
+
+%if %{with python3}
+%package -n python3-%{srcname}
+%if %{with python36_module}
+BuildRequires:  python36-devel
+BuildRequires:  python36-rpm-macros
+%else
+BuildRequires:  python3-devel
 %endif
-Summary:        Syntax highlighting engine written in Python
+BuildRequires:  python3-setuptools, python3-nose
-%{?python_provide:%python_provide python%{python3_pkgversion}-pygments}
+Summary:        %{sum}
+%{?python_provide:%python_provide python3-%{srcname}}
 
-%description -n python%{python3_pkgversion}-pygments %_description
+%description -n python3-%{srcname}
+Pygments is a generic syntax highlighter for general use in all kinds
+of software such as forum systems, wikis or other applications that
+need to prettify source code. Highlights are:
 
-%prep
+  * a wide range of common languages and markup formats is supported
-%autosetup -p1 -n Pygments-%{version}
+  * special attention is paid to details that increase highlighting
+    quality
+  * support for new languages and formats are added easily; most
+    languages use a simple regex-based lexing mechanism
+  * a number of output formats is available, among them HTML, RTF,
+    LaTeX and ANSI sequences
+  * it is usable as a command-line tool and as a library
+  * ... and it highlights even Brainf*ck!
+%endif
 
-%generate_buildrequires
+%prep
-%pyproject_buildrequires
+%setup -q -n %{upstream_name}-%{version}
+%patch0 -p 1
+%patch1 -p1
+%patch2 -p1
 
 %build
-sed -i 's/\r//' LICENSE
+%{__sed} -i 's/\r//' LICENSE
-%pyproject_wheel
+%{?with_python2:%py2_build}
+%{?with_python3:%py3_build}
+%{?with_doc:%{__python3} setup.py build_sphinx}
 
 %install
-%pyproject_install
+# Python 2 install
-%pyproject_save_files pygments
+# NOTE: sphinx is built on Python 3 and packages with python2 and python3
-
+%if %{with python2}
-%if %{with docs}
+%py2_install
-%{python3} setup.py build_sphinx
+mv %{buildroot}%{_bindir}/pygmentize{,-%{python2_version}}
-rm -rf build/sphinx/html/.buildinfo
+ln -s pygmentize-%{python2_version} %{buildroot}%{_bindir}/pygmentize-2
-install doc/pygmentize.1 -Dt %{buildroot}%{_mandir}/man1/
-chmod -x %{buildroot}%{_mandir}/man1/*.1
 %endif
+
+%if %{with doc}
+pushd doc
+install -d %{buildroot}%{_mandir}/man1
+mv pygmentize.1 $RPM_BUILD_ROOT%{_mandir}/man1/pygmentize.1
+popd
 cp -r doc/docs doc/reST
+%endif
 
+%if %{with python3}
+%py3_install
+cp %{buildroot}%{_bindir}/pygmentize{,-%{python3_version}}
+ln -s pygmentize-%{python3_version} %{buildroot}%{_bindir}/pygmentize-3
+%endif
 
-%if %{with tests}
 %check
-make test PYTHON=%{python3}
+%if %{with tests}
+%{?with_python2:make test PYTHON=%{__python2}}
+%{?with_python3:make test PYTHON=%{__python3}}
 %endif
 
+%if %{with python2}
+%files -n python2-pygments
+%doc AUTHORS CHANGES TODO
+%if %{with doc}
+%doc build/sphinx/html doc/reST
+%lang(en) %{_mandir}/man1/pygmentize.1*
+%endif
+%license LICENSE
+%{python2_sitelib}/*
+%{_bindir}/pygmentize-2
+%{_bindir}/pygmentize-%{python2_version}
+%endif
 
-%files -n python%{python3_pkgversion}-pygments -f %{pyproject_files}
+%if %{with python3}
-%doc AUTHORS CHANGES doc/reST
+%files -n python3-pygments
+%doc AUTHORS CHANGES TODO
+%if %{with doc}
+%doc build/sphinx/html doc/reST
+%lang(en) %{_mandir}/man1/pygmentize.1*
+%endif
 %license LICENSE
+%{python3_sitelib}/*
 %{_bindir}/pygmentize
-%if %{with docs}
+%{_bindir}/pygmentize-3
-%lang(en) %{_mandir}/man1/pygmentize.1*
+%{_bindir}/pygmentize-%{python3_version}
-%doc build/sphinx/html
 %endif
 
 %changelog
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.7.4-4
+* Thu Apr 22 2021 Lumír Balhar <lbalhar@redhat.com> - 2.2.0-22
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Fix CVE-2021-27291: ReDos via crafted malicious input
-  Related: rhbz#1991688
+Resolves: rhbz#1943459 rhbz#1943460
-
-* Thu Jun 03 2021 Petr Viktorin <pviktori@redhat.com> - 2.7.4-3
-- Remove test files with a no-nuclear license from the sources
-- Related: rhbz#1950291
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.7.4-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Fri Jan 29 12:41:43 CET 2021 Tomas Hrnciar <thrnciar@redhat.com> - 2.7.4-1
-- Update to 2.7.4
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Nov 25 2020 Petr Viktorin <pviktori@redhat.com> - 2.7.2-1
-- Update to 2.7.2
-
-* Mon Oct 12 2020 Tomas Hrnciar <thrnciar@redhat.com> - 2.7.1-1
-- Update to 2.7.1
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 2.6.1-3
-- Rebuilt for Python 3.9
-
-* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 2.6.1-2
-- Bootstrap for Python 3.9
-
-* Tue May 19 2020 Miro Hrončok <mhroncok@redhat.com> - 2.6.1-1
-- Update to 2.6.1 (#1776922)
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.2-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Nov 15 2019 Miro Hrončok <mhroncok@redhat.com> - 2.4.2-6
-- Subpackage python2-pygments has been removed
-  See https://fedoraproject.org/wiki/Changes/RetirePython2
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 2.4.2-5
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 2.4.2-4
-- Rebuilt for Python 3.8
 
-* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 2.4.2-3
+* Wed Mar 03 2021 Charalampos Stratakis <cstratak@redhat.com> - 2.2.0-21
-- Bootstrap for Python 3.8
+- Fix CVE-2021-20270: infinite loop in SML lexer which may lead to DoS
+Resolves: rhbz#1933876
 
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.2-2
+* Thu Apr 25 2019 Tomas Orsava <torsava@redhat.com> - 2.2.0-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+- Bumping due to problems with modular RPM upgrade path
+- Resolves: rhbz#1695587
 
-* Wed Jul 10 2019 Kevin Fenzi <kevin@scrye.com> - 2.4.2-1
+* Mon Sep 17 2018 Lumír Balhar <lbalhar@redhat.com> - 2.2.0-19
-- Update to 2.4.2. Fixes bug #1707945
+- Get rid of unversioned Python dependencies
+- Resolves: rhbz#1628242
 
-* Tue Mar 12 2019 Miro Hrončok <mhroncok@redhat.com> - 2.3.1-1
+* Wed Aug 08 2018 Lumír Balhar <lbalhar@redhat.com> - 2.2.0-18
-- Update to 2.3.1
+- Remove unversioned binaries from python2 subpackage
+- Resolves: rhbz#1613343
 
-* Mon Mar 11 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.2.0-17
+* Wed Aug 01 2018 Lumír Balhar <lbalhar@redhat.com> - 2.2.0-17
-- Use python3-sphinx to build docs
+- Specfile cleanup
+- Condition for tests
+- Condition for doc
 
-* Tue Feb 26 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.2.0-16
+* Tue Jul 31 2018 Lumír Balhar <lbalhar@redhat.com> - 2.2.0-16
-- Add missing setuptools Requires
+- Switch python3 coditions to bcond
 
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-15
+* Wed Jul 18 2018 Tomas Orsava <torsava@redhat.com> - 2.2.0-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+- BuildRequire also python36-rpm-macros as part of the python36 module build
 
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-14
+* Wed Jul 04 2018 Miro Hrončok <mhroncok@redhat.com> - 2.2.0-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+- Add a bcond for python2
+- Fix the test invocation
 
-* Wed Jul 04 2018 Miro Hrončok <mhroncok@redhat.com> - 2.2.0-13
+* Thu Jun 14 2018 Tomas Orsava <torsava@redhat.com> - 2.2.0-13
-- Run tests
+- Switch to using Python 3 version of sphinx
-- Add fix for 3.7
 
-* Thu Jun 14 2018 Miro Hrončok <mhroncok@redhat.com> - 2.2.0-12
+* Mon Apr 30 2018 Tomas Orsava <torsava@redhat.com> - 2.2.0-12
-- Rebuilt for Python 3.7
+- Require the python36-devel package when building for the python36 module
 
 * Mon Mar 19 2018 Steve Milner <smilner@redhat.com> - 2.2.0-11
 - Added import-directive.patch to work around a change in sphinx.
@@ -181,7 +233,7 @@ make test PYTHON=%{python3}
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 
-* Thu Mar 23 2017 Steve Milner <smilner@redhat.com> - 2.2.0-7
+* Thu Mar 22 2017 Steve Milner <smilner@redhat.com> - 2.2.0-7
 - Fixed python2 sitelib in files section.
 
 * Wed Mar 22 2017 Steve Milner <smilner@redhat.com> - 2.2.0-6