diff --git a/.gitignore b/.gitignore index 6bbc88a..8e79b5b 100644 --- a/.gitignore +++ b/.gitignore @@ -55,5 +55,3 @@ 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 -/php-twig-1.44.7-0887422.tgz diff --git a/3563.patch b/3563.patch new file mode 100644 index 0000000..dcb0abb --- /dev/null +++ b/3563.patch @@ -0,0 +1,23 @@ +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 041fe1d..b73d649 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -1,7 +1,7 @@ # # Fedora spec file for php-twig # -# Copyright (c) 2014-2022 Shawn Iwinski +# Copyright (c) 2014-2021 Shawn Iwinski # Remi Collet # # License: MIT @@ -15,8 +15,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.44.7 -%global github_commit 0887422319889e442458e48e2f3d9add1a172ad5 +%global github_version 1.44.5 +%global github_commit dd4353357c5a116322e92a00d16043a31881a81e %global github_short %(c=%{github_commit}; echo ${c:0:7}) # Lib @@ -31,15 +31,16 @@ Name: php-%{composer_project} Version: %{github_version} -Release: 9%{?dist} +Release: 1%{?dist} Summary: The flexible, fast, and secure template engine for PHP -# Automatically converted from old format: BSD - review is highly recommended. -License: LicenseRef-Callaway-BSD +License: BSD 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 @@ -115,6 +116,7 @@ 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 @@ -159,7 +161,7 @@ sed -e '/listener/d' phpunit.xml.dist > phpunit.xml : Test suite without extension ret=0 -for SCL in "php %{phpunit}" php74 php80 php81 php82; do +for SCL in "php %{phpunit}" php73 php74 php80; do if which $SCL; then set $SCL $1 ${2:-%{_bindir}/phpunit9} $SKIP \ @@ -180,43 +182,6 @@ exit $RETURN_CODE %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 1.44.7-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 1.44.7-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Sep 4 2024 Miroslav Suchý - 1.44.7-7 -- convert license to SPDX - -* Fri Jul 19 2024 Fedora Release Engineering - 1.44.7-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 1.44.7-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 1.44.7-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 1.44.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jan 20 2023 Fedora Release Engineering - 1.44.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Sep 29 2022 Remi Collet - 1.44.7-1 -- update to 1.44.7 - -* Fri Jul 22 2022 Fedora Release Engineering - 1.44.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 21 2022 Fedora Release Engineering - 1.44.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* 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 a2b94d0..1b177e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.44.7-0887422.tgz) = 7dbf734b7113dd0e1be34710d4a369cd902ab955346c4348a003a9844c8d55316f0f0713fe208d2b62f03cf4c799885432f79162b1c62c7b9304862f5b7c89b0 +SHA512 (php-twig-1.44.5-dd43533.tgz) = 11f329c437af2b8550a5812142918f5210c018b805e3c56d44c6934d4d8056d675621fec0e590240543816c71aa962a1b7c516b4b004eda971e7c58eb6b664df