Update to 2.6.1, clean up a bit

Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1776922

.gitignore

@@ -7,3 +7,4 @@ Pygments-1.3.1.tar.gz
 /Pygments-2.2.0.tar.gz
 /Pygments-2.3.1.tar.gz
 /Pygments-2.4.2.tar.gz
+/Pygments-2.6.1.tar.gz

python-pygments.spec

@@ -1,22 +1,19 @@
-%global upstream_name Pygments
+# when bootstrapping, we cannot yet use sphinx and pytest
-%global srcname pygments
-%global sum Syntax highlighting engine written in Python
-
-# when bootstrapping, we cannot yet use sphinx
 %bcond_without docs
+%bcond_without tests
 
 Name:           python-pygments
-Version:        2.4.2
+Version:        2.6.1
-Release:        7%{?dist}
+Release:        1%{?dist}
-Summary:        %{sum}
+Summary:        Syntax highlighting engine written in Python
 
 License:        BSD
-URL:            http://pygments.org/
+URL:            https://pygments.org/
-Source0:        %{pypi_source %{upstream_name} %{version}}
+Source0:        %{pypi_source Pygments %{version}}
 
 BuildArch:      noarch
 
-%description
+%global _description %{expand:
 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:
@@ -29,58 +26,51 @@ 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 python3-%{srcname}
+%package -n python3-pygments
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
-BuildRequires:  python3-nose
+%if %{with tests}
-Requires:       python3-setuptools
+BuildRequires:  python3-pytest
+%endif
 %if %{with docs}
 BuildRequires:  python3-sphinx
 %endif
-Summary:        %{sum}
+Summary:        Syntax highlighting engine written in Python
-%{?python_provide:%python_provide python3-%{srcname}}
+%{?python_provide:%python_provide python3-pygments}
 
-%description -n python3-%{srcname}
+%description -n python3-pygments %_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:
-
-  * 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!
 
 %prep
-%autosetup -p1 -n %{upstream_name}-%{version}
+%autosetup -p1 -n Pygments-%{version}
 
 %build
-%{__sed} -i 's/\r//' LICENSE
+sed -i 's/\r//' LICENSE
 %py3_build
 
 %install
 %py3_install
 
 %if %{with docs}
-%{__python3} setup.py build_sphinx
+%{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=%{__python3}
+make test PYTHON=%{python3}
+%endif
 
 
 %files -n python3-pygments
-%doc AUTHORS CHANGES doc/reST TODO
+%doc AUTHORS CHANGES doc/reST
 %license LICENSE
 %{python3_sitelib}/pygments/
 %{python3_sitelib}/Pygments-%{version}-py%{python3_version}.egg-info/
@@ -91,6 +81,9 @@ make test PYTHON=%{__python3}
 %endif
 
 %changelog
+* 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
 

sources

@@ -1 +1 @@
-SHA512 (Pygments-2.4.2.tar.gz) = c8f378700e99d9e5701ac7e27363921dbabab50a910686aafda1e016c813e99915fcfeed8298323b9b681b3d81f4265ab9a5bb75b8cdff0668c9eff745337b66
+SHA512 (Pygments-2.6.1.tar.gz) = 0d793bb6eabe43645541347e44932ee50ccd4309f40e7a327422bcbe57d40a7cb8bbf2fb0911744ed6f316c6c08f4216462be88d79192a2ea004d6da51329932