From a9b56752f837d3b3619a38d5dc9bed9d8c83883b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 16 Aug 2021 11:33:58 +0200 Subject: [PATCH] Update to 2.10.0 The file with unclear license was nuked upstream: https://github.com/pygments/pygments/commit/c3e73e90176ddbec103347a4ca8d23bc4e842b4f --- get-clean-tarball.sh | 26 -------------------------- python-pygments.spec | 16 +++++++--------- sources | 2 +- 3 files changed, 8 insertions(+), 36 deletions(-) delete mode 100755 get-clean-tarball.sh diff --git a/get-clean-tarball.sh b/get-clean-tarball.sh deleted file mode 100755 index a70175e..0000000 --- a/get-clean-tarball.sh +++ /dev/null @@ -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/java/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 diff --git a/python-pygments.spec b/python-pygments.spec index c17fb46..a344346 100644 --- a/python-pygments.spec +++ b/python-pygments.spec @@ -3,19 +3,13 @@ %bcond_without tests Name: python-pygments -Version: 2.9.0 -Release: 2%{?dist} +Version: 2.10.0 +Release: 1%{?dist} Summary: Syntax highlighting engine written in Python License: BSD URL: https://pygments.org/ - -# One of the examples cannot be distributed in Fedora SRPM, see: -# https://github.com/pygments/pygments/issues/1831 -# To obtain a cleaned-up tarball, run: -# $ ./get-clean-tarball.sh -Source0: Pygments-%{version}-clean.tar.xz -Source1: get-clean-tarball.sh +Source0: %{pypi_source Pygments} BuildArch: noarch @@ -90,6 +84,10 @@ make test PYTHON=%{python3} %endif %changelog +* Mon Aug 16 2021 Miro HronĨok - 2.10.0-1 +- Update to 2.10.0 +- Fixes: rhbz#1993673 + * Fri Jul 23 2021 Fedora Release Engineering - 2.9.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index cd97f0f..3032b30 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Pygments-2.9.0-clean.tar.xz) = 2cdb1dbe5f98f6701ee606d38e19bfefb8e09dfe66a86bcbe1a984c54529eb26f6b45ec8bfb17399c6ffcd1ccba30d5856732ab70499efb6808028d3eaf9fa46 +SHA512 (Pygments-2.10.0.tar.gz) = 28fdf35e333717795f199e0ef936d6df16ac0752324839ac36cabd2f9f6759a57663527d37f1c2f470258d63c3cf190f6dd4b631b21c849fc76575036fbdae12