diff --git a/Pygments-2.2.0.tar.gz b/Pygments-2.2.0.tar.gz deleted file mode 100644 index 870d1b2..0000000 Binary files a/Pygments-2.2.0.tar.gz and /dev/null differ diff --git a/Pygments-2.6.1.tar.gz b/Pygments-2.6.1.tar.gz new file mode 100644 index 0000000..2a76de8 Binary files /dev/null and b/Pygments-2.6.1.tar.gz differ diff --git a/import-directive.patch b/import-directive.patch deleted file mode 100644 index cc25063..0000000 --- a/import-directive.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 - - diff --git a/pep479.patch b/pep479.patch deleted file mode 100644 index 46fda97..0000000 --- a/pep479.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -r 7941677dc77d pygments/lexers/lisp.py ---- a/pygments/lexers/lisp.py Mon Mar 13 19:16:03 2017 +0000 -+++ b/pygments/lexers/lisp.py Wed Jul 04 18:03:07 2018 +0200 -@@ -2327,13 +2327,13 @@ - token = Name.Function if token == Literal else token - yield index, token, value - -- raise StopIteration -+ return - - def _process_signature(self, tokens): - for index, token, value in tokens: - if token == Literal and value == '}': - yield index, Punctuation, value -- raise StopIteration -+ return - elif token in (Literal, Name.Function): - token = Name.Variable if value.istitle() else Keyword.Type - yield index, token, value -diff -r 7941677dc77d pygments/lexers/sql.py ---- a/pygments/lexers/sql.py Mon Mar 13 19:16:03 2017 +0000 -+++ b/pygments/lexers/sql.py Wed Jul 04 18:03:07 2018 +0200 -@@ -347,7 +347,10 @@ - # Emit the output lines - out_token = Generic.Output - while 1: -- line = next(lines) -+ try: -+ line = next(lines) -+ except StopIteration: -+ return - mprompt = re_prompt.match(line) - if mprompt is not None: - # push the line back to have it processed by the prompt diff --git a/python-pygments.spec b/python-pygments.spec index b228143..401d3bf 100644 --- a/python-pygments.spec +++ b/python-pygments.spec @@ -15,31 +15,25 @@ need to prettify source code. Highlights are: \ Name: python-pygments Summary: Syntax highlighting engine written in Python -Version: 2.2.0 -Release: 15 +Version: 2.6.1 +Release: 1 License: BSD URL: http://pygments.org/ Source0: https://pypi.org/packages/source/P/Pygments/Pygments-%{version}.tar.gz -Patch0: import-directive.patch -Patch1: pep479.patch - BuildArch: noarch %description %{_description} -%package -n python2-pygments -BuildRequires: python2-devel >= 2.4, python2-setuptools -BuildRequires: python2-nose, python2-sphinx -Summary: Syntax highlighting engine written in Python -%{?python_provide:%python_provide python2-pygments} - -%description -n python2-pygments -%{_description} - %package -n python3-pygments -BuildRequires: python3-devel, python3-setuptools, python3-nose +BuildRequires: python3-devel, python3-setuptools +%if %{with tests} +BuildRequires: python3-pytest +%endif +%if %{with docs} +BuildRequires: python3-sphinx +%endif Summary: Syntax highlighting engine written in Python %{?python_provide:%python_provide python3-pygments} @@ -53,27 +47,22 @@ Summary: Syntax highlighting engine written in Python %build %{__sed} -i 's/\r//' LICENSE -%py2_build %py3_build %install -%py2_install -%{__python2} setup.py build_sphinx -pushd doc -install -d %{buildroot}%{_mandir}/man1 -mv pygmentize.1 %{buildroot}%{_mandir}/man1/pygmentize.1 -popd -cp -r doc/docs doc/reST - %py3_install - +%if %{with docs} +%{__python3} setup.py build_sphinx +rm -rf build/sphinx/html/.buildinfo +install doc/pygmentize.1 -Dt %{buildroot}%{_mandir}/man1/ +chmod -x %{buildroot}%{_mandir}/man1/*.1 +%endif +cp -r doc/docs doc/reST +%if %{with tests} %check -make test PYTHON=%{__python2} -make test PYTHON=%{__python3} +make test PYTHON=%{python3} +%endif -%files -n python2-pygments -%license LICENSE -%{python2_sitelib}/* %files -n python3-pygments %license LICENSE @@ -81,9 +70,15 @@ make test PYTHON=%{__python3} %{_bindir}/pygmentize %files help -%doc AUTHORS CHANGES build/sphinx/html doc/reST TODO +%doc AUTHORS CHANGES doc/reST +%if %{with docs} %lang(en) %{_mandir}/man1/pygmentize.1* +%doc build/sphinx/html +%endif %changelog +* Tue Jul 28 2020 jinzhimin - 2.6.1-1 +- update to 2.6.1-1 + * Fri Dec 6 2019 caomeng - 2.2.0-15 -- Package init \ No newline at end of file +- Package init