From 09f8249640574d5bc256a68238484d609d6e2872 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 25 Nov 2021 16:28:58 +0100 Subject: [PATCH 01/12] update to 1.44.6 (no change) drop patch merged upstream --- .gitignore | 1 + 3563.patch | 23 ----------------------- php-twig.spec | 13 +++++++------ sources | 2 +- 4 files changed, 9 insertions(+), 30 deletions(-) delete mode 100644 3563.patch 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 From a59d2e60e622a7dc79f0cc1a66e249291b0e5ca5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 08:43:01 +0000 Subject: [PATCH 02/12] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-twig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-twig.spec b/php-twig.spec index 1d597e2..d7375e9 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -31,7 +31,7 @@ Name: php-%{composer_project} Version: %{github_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: The flexible, fast, and secure template engine for PHP License: BSD @@ -179,6 +179,9 @@ exit $RETURN_CODE %changelog +* 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 From d782293c5e68d293c4a2b3403c2a4652b16c6c95 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 14:36:33 +0000 Subject: [PATCH 03/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-twig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-twig.spec b/php-twig.spec index d7375e9..d09ae77 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -31,7 +31,7 @@ Name: php-%{composer_project} Version: %{github_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: The flexible, fast, and secure template engine for PHP License: BSD @@ -179,6 +179,9 @@ exit $RETURN_CODE %changelog +* 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 From ddae66f6c26fe427c4cc9953c8d7ec34998fbd8d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 29 Sep 2022 12:01:09 +0200 Subject: [PATCH 04/12] v1.44.7 --- .gitignore | 1 + php-twig.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 7964265..6bbc88a 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ clog /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/php-twig.spec b/php-twig.spec index d09ae77..202b1e8 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -1,7 +1,7 @@ # # Fedora spec file for php-twig # -# Copyright (c) 2014-2021 Shawn Iwinski +# Copyright (c) 2014-2022 Shawn Iwinski # Remi Collet # # License: MIT @@ -15,8 +15,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.44.6 -%global github_commit ae39480f010ef88adc7938503c9b02d3baf2f3b3 +%global github_version 1.44.7 +%global github_commit 0887422319889e442458e48e2f3d9add1a172ad5 %global github_short %(c=%{github_commit}; echo ${c:0:7}) # Lib @@ -31,7 +31,7 @@ Name: php-%{composer_project} Version: %{github_version} -Release: 3%{?dist} +Release: 1%{?dist} Summary: The flexible, fast, and secure template engine for PHP License: BSD @@ -158,7 +158,7 @@ sed -e '/listener/d' phpunit.xml.dist > phpunit.xml : Test suite without extension ret=0 -for SCL in "php %{phpunit}" php74 php80 php81; do +for SCL in "php %{phpunit}" php74 php80 php81 php82; do if which $SCL; then set $SCL $1 ${2:-%{_bindir}/phpunit9} $SKIP \ @@ -179,6 +179,9 @@ exit $RETURN_CODE %changelog +* 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 diff --git a/sources b/sources index 0eb81bd..a2b94d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.44.6-ae39480.tgz) = eb5b0de0d20750fa4759f726125da0844423a1d5757fd06de4868f2bcee179adb102c89d982cb7fc5325cadc9b957f17d7ec371915c41e6f225bbc79b900716b +SHA512 (php-twig-1.44.7-0887422.tgz) = 7dbf734b7113dd0e1be34710d4a369cd902ab955346c4348a003a9844c8d55316f0f0713fe208d2b62f03cf4c799885432f79162b1c62c7b9304862f5b7c89b0 From b180c8f0b6846d4a52a246d4ef41fc48a00f35dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 09:31:35 +0000 Subject: [PATCH 05/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-twig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-twig.spec b/php-twig.spec index 202b1e8..78770b5 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -31,7 +31,7 @@ Name: php-%{composer_project} Version: %{github_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: The flexible, fast, and secure template engine for PHP License: BSD @@ -179,6 +179,9 @@ exit $RETURN_CODE %changelog +* 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 From 9a67bd0ddf7864e51415cf20e483ef41051122f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 05:23:28 +0000 Subject: [PATCH 06/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-twig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-twig.spec b/php-twig.spec index 78770b5..c20bbf4 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -31,7 +31,7 @@ Name: php-%{composer_project} Version: %{github_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: The flexible, fast, and secure template engine for PHP License: BSD @@ -179,6 +179,9 @@ exit $RETURN_CODE %changelog +* 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 From 7e0109ced6f294cb67efcba0210501cc4a7d9b84 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 21:35:50 +0000 Subject: [PATCH 07/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-twig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-twig.spec b/php-twig.spec index c20bbf4..c5ff52e 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -31,7 +31,7 @@ Name: php-%{composer_project} Version: %{github_version} -Release: 3%{?dist} +Release: 4%{?dist} Summary: The flexible, fast, and secure template engine for PHP License: BSD @@ -179,6 +179,9 @@ exit $RETURN_CODE %changelog +* 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 From e7e73df61b16b25b66deefc4c9a26ecd3c9e96fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 23:23:34 +0000 Subject: [PATCH 08/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-twig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-twig.spec b/php-twig.spec index c5ff52e..0c75c75 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -31,7 +31,7 @@ Name: php-%{composer_project} Version: %{github_version} -Release: 4%{?dist} +Release: 5%{?dist} Summary: The flexible, fast, and secure template engine for PHP License: BSD @@ -179,6 +179,9 @@ exit $RETURN_CODE %changelog +* 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 From 8f8b58a0bd930f04388efbc72a0866430a9c89d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 07:39:06 +0000 Subject: [PATCH 09/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- php-twig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-twig.spec b/php-twig.spec index 0c75c75..a9d43e4 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -31,7 +31,7 @@ Name: php-%{composer_project} Version: %{github_version} -Release: 5%{?dist} +Release: 6%{?dist} Summary: The flexible, fast, and secure template engine for PHP License: BSD @@ -179,6 +179,9 @@ exit $RETURN_CODE %changelog +* 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 From 445a1abbbd1301ab5d041aaef9a7a7a2a65f2d76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 19:07:33 +0200 Subject: [PATCH 10/12] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- php-twig.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/php-twig.spec b/php-twig.spec index a9d43e4..98fffbb 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -31,10 +31,11 @@ Name: php-%{composer_project} Version: %{github_version} -Release: 6%{?dist} +Release: 7%{?dist} Summary: The flexible, fast, and secure template engine for PHP -License: BSD +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD URL: http://twig.sensiolabs.org Source0: %{name}-%{github_version}-%{github_short}.tgz Source1: makesrc.sh @@ -179,6 +180,9 @@ exit $RETURN_CODE %changelog +* 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 From 227f42e01856340dd0eb4ee429a41c2c62233d29 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 09:56:50 +0000 Subject: [PATCH 11/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- php-twig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-twig.spec b/php-twig.spec index 98fffbb..639119e 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -31,7 +31,7 @@ Name: php-%{composer_project} Version: %{github_version} -Release: 7%{?dist} +Release: 8%{?dist} Summary: The flexible, fast, and secure template engine for PHP # Automatically converted from old format: BSD - review is highly recommended. @@ -180,6 +180,9 @@ exit $RETURN_CODE %changelog +* 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 From ba0263fa89282d00fe8702915abddc8a4d5eae72 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:40:12 +0000 Subject: [PATCH 12/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- php-twig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-twig.spec b/php-twig.spec index 639119e..041fe1d 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -31,7 +31,7 @@ Name: php-%{composer_project} Version: %{github_version} -Release: 8%{?dist} +Release: 9%{?dist} Summary: The flexible, fast, and secure template engine for PHP # Automatically converted from old format: BSD - review is highly recommended. @@ -180,6 +180,9 @@ 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