diff --git a/.gitignore b/.gitignore index 8e79b5b..7964265 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ clog /php-twig-1.44.3-920a9b9.tgz /php-twig-1.44.4-4d40042.tgz /php-twig-1.44.5-dd43533.tgz +/php-twig-1.44.6-ae39480.tgz diff --git a/3563.patch b/3563.patch deleted file mode 100644 index dcb0abb..0000000 --- a/3563.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 61df934a7ea2ed0c9860bf62c0c68f5318d99926 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Wed, 22 Sep 2021 11:33:46 +0200 -Subject: [PATCH] Missing Environment and LoaderInterface - ---- - tests/escapingTest.php | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/tests/escapingTest.php b/tests/escapingTest.php -index a35ce9ab1..6ebb7b7e3 100644 ---- a/tests/escapingTest.php -+++ b/tests/escapingTest.php -@@ -2,6 +2,9 @@ - - namespace Twig\Tests; - -+use Twig\Environment; -+use Twig\Loader\LoaderInterface; -+ - /** - * This class is adapted from code coming from Zend Framework. - * diff --git a/php-twig.spec b/php-twig.spec index b73d649..1d597e2 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -15,8 +15,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.44.5 -%global github_commit dd4353357c5a116322e92a00d16043a31881a81e +%global github_version 1.44.6 +%global github_commit ae39480f010ef88adc7938503c9b02d3baf2f3b3 %global github_short %(c=%{github_commit}; echo ${c:0:7}) # Lib @@ -39,8 +39,6 @@ URL: http://twig.sensiolabs.org Source0: %{name}-%{github_version}-%{github_short}.tgz Source1: makesrc.sh -Patch0: https://patch-diff.githubusercontent.com/raw/twigphp/Twig/pull/3563.patch - BuildArch: noarch # as we use phpunit9 (for assertFileDoesNotExist) BuildRequires: php-devel >= 7.3 @@ -116,7 +114,6 @@ Autoloader: %{phpdir}/Twig/autoload.php %prep %setup -qn %{github_name}-%{github_commit} -%patch0 -p1 : Move the PSR-4 compat library mv src lib/Twig/psr4 @@ -161,7 +158,7 @@ sed -e '/listener/d' phpunit.xml.dist > phpunit.xml : Test suite without extension ret=0 -for SCL in "php %{phpunit}" php73 php74 php80; do +for SCL in "php %{phpunit}" php74 php80 php81; do if which $SCL; then set $SCL $1 ${2:-%{_bindir}/phpunit9} $SKIP \ @@ -182,6 +179,10 @@ exit $RETURN_CODE %changelog +* Thu Nov 25 2021 Remi Collet - 1.44.6-1 +- update to 1.44.6 (no change) +- drop patch merged upstream + * Wed Sep 22 2021 Remi Collet - 1.44.5-1 - update to 1.44.5 - add patch for test suite from https://github.com/twigphp/Twig/pull/3563 diff --git a/sources b/sources index 1b177e2..0eb81bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.44.5-dd43533.tgz) = 11f329c437af2b8550a5812142918f5210c018b805e3c56d44c6934d4d8056d675621fec0e590240543816c71aa962a1b7c516b4b004eda971e7c58eb6b664df +SHA512 (php-twig-1.44.6-ae39480.tgz) = eb5b0de0d20750fa4759f726125da0844423a1d5757fd06de4868f2bcee179adb102c89d982cb7fc5325cadc9b957f17d7ec371915c41e6f225bbc79b900716b