From da19a7c1e86388da83832e7afd6258341621c0ec Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Feb 11 2022 15:49:53 +0000 Subject: Update to 2.11.2 - Build docs with make as upstream does - this way the upstream defined file paths work with our build as well --- diff --git a/python-pygments.spec b/python-pygments.spec index 81c16ce..6e34b33 100644 --- a/python-pygments.spec +++ b/python-pygments.spec @@ -3,8 +3,8 @@ %bcond_without tests Name: python-pygments -Version: 2.10.0 -Release: 2%{?dist} +Version: 2.11.2 +Release: 1%{?dist} Summary: Syntax highlighting engine written in Python License: BSD @@ -16,12 +16,17 @@ BuildArch: noarch BuildRequires: python%{python3_pkgversion}-devel BuildRequires: pyproject-rpm-macros %if %{with tests} -BuildRequires: make BuildRequires: python%{python3_pkgversion}-pytest +BuildRequires: python%{python3_pkgversion}-lxml %endif %if %{with docs} BuildRequires: python%{python3_pkgversion}-sphinx %endif +%if %{with docs} || %{with tests} +BuildRequires: python%{python3_pkgversion}-wcag-contrast-ratio +BuildRequires: make +%endif + %global _description %{expand: Pygments is a generic syntax highlighter suitable for use in code hosting, @@ -64,8 +69,9 @@ Provides: pygmentize = %{?epoch:%{epoch}:}%{version}-%{release} %pyproject_save_files pygments %if %{with docs} -%{python3} setup.py build_sphinx -rm -rf build/sphinx/html/.buildinfo +%make_build -C doc html +rm doc/_build/html/.buildinfo +rm -rf doc/_build/html/_sources install doc/pygmentize.1 -Dt %{buildroot}%{_mandir}/man1/ chmod -x %{buildroot}%{_mandir}/man1/*.1 %endif @@ -83,11 +89,15 @@ make test PYTHON=%{python3} %{_bindir}/pygmentize %if %{with docs} %lang(en) %{_mandir}/man1/pygmentize.1* -%doc build/sphinx/html +%doc doc/_build/html %endif %changelog +* Fri Feb 11 2022 Karolina Surma - 2.11.2-1 +- Update to 2.11.2 +- Fixes: rhbz#2036218 + * Fri Jan 21 2022 Fedora Release Engineering - 2.10.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 3032b30..d705286 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Pygments-2.10.0.tar.gz) = 28fdf35e333717795f199e0ef936d6df16ac0752324839ac36cabd2f9f6759a57663527d37f1c2f470258d63c3cf190f6dd4b631b21c849fc76575036fbdae12 +SHA512 (Pygments-2.11.2.tar.gz) = 606ff0c35fa47882f4c5c3794827132e1ee6ccbb4895ae858f9c93ea0c92b73163c9f4d630b51a8bb782ba0b4944a66d1059ad5d017d3191a0a5b30c1e5b8f9f