From e5fc3342cdffcd2b9d57c9745505f094c6960d6a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 6 Jul 2020 12:32:57 +0200 Subject: [PATCH 01/23] update to 1.43.0 raise dependency on PHP 7.1.3 switch to phpunit8 --- .gitignore | 1 + php-twig.spec | 29 +++++++++++++++++------------ sources | 2 +- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 48f6ce9..59e230a 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ clog /php-twig-1.42.3-201baee843e0ffe8b0b956f336dd42b2a92fae4e.tar.gz /php-twig-1.42.4-e587180.tgz /php-twig-1.42.5-87b2ea9.tgz +/php-twig-1.43.0-597a03e.tgz diff --git a/php-twig.spec b/php-twig.spec index 7aee163..056dfe1 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -1,7 +1,7 @@ # # Fedora spec file for php-twig # -# Copyright (c) 2014-2019 Shawn Iwinski +# Copyright (c) 2014-2020 Shawn Iwinski # Remi Collet # # License: MIT @@ -12,19 +12,19 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.42.5 -%global github_commit 87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e +%global github_version 1.43.0 +%global github_commit 597a03e85a60af6feee4f5127f3ef4279a1694c3 %global github_short %(c=%{github_commit}; echo ${c:0:7}) # Lib %global composer_vendor twig %global composer_project twig -# "php": ">=5.5.0" -%global php_min_ver 5.5 +# "php": ">=7.1.3" +%global php_min_ver 7.1.3 # Build using "--without tests" to disable tests -%global with_tests 0%{!?_without_tests:1} +%bcond_without tests %{!?phpdir: %global phpdir %{_datadir}/php} %{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} @@ -42,8 +42,8 @@ Source1: makesrc.sh BuildArch: noarch BuildRequires: php-devel >= %{php_min_ver} # Tests -%if %{with_tests} -BuildRequires: phpunit7 +%if %{with tests} +BuildRequires: phpunit8 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(symfony/debug) >= 3.4 with php-composer(symfony/debug) < 4) BuildRequires: (php-composer(psr/container) >= 1.0 with php-composer(psr/container) < 2) @@ -144,7 +144,7 @@ cp -rp lib/* %{buildroot}%{phpdir}/ %{_bindir}/php -r 'require_once "%{buildroot}%{phpdir}/Twig/autoload.php"; exit(version_compare("%{version}", Twig\Environment::VERSION, "=") ? 0 : 1);' -%if %{with_tests} +%if %{with tests} : Generate autoloader mkdir vendor cat << 'EOF' | tee vendor/autoload.php @@ -157,14 +157,14 @@ require_once '%{buildroot}%{phpdir}/Twig/autoload.php'; )); EOF -: Disable listener from symfony/phpunit-bridge ^4.4@dev +: Disable listener from symfony/phpunit-bridge # ^4.4.9|^5.0.9 sed -e '/listener/d' phpunit.xml.dist > phpunit.xml : Test suite without extension ret=0 -for cmd in php php71 php72 php73 php74; do +for cmd in php php72 php73 php74 php80; do if which $cmd; then - $cmd %{_bindir}/phpunit7 \ + $cmd %{_bindir}/phpunit8 \ --filter '^((?!(testGetAttributeExceptions|testGetAttributeWithTemplateAsObject)).)*$' \ --verbose || ret=1 fi @@ -185,6 +185,11 @@ exit $ret %changelog +* Mon Jul 6 2020 Remi Collet - 1.43.0-1 +- update to 1.43.0 +- raise dependency on PHP 7.1.3 +- switch to phpunit8 + * Wed Feb 12 2020 Remi Collet - 1.42.5-1 - update to 1.42.5 diff --git a/sources b/sources index 2c7c3e6..004a912 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.42.5-87b2ea9.tgz) = 3f2f188f8e050478fd381b5487ce341b5a2932b53fb6cde688229c04f30a3149e7e48d55406cd4b12de32b59f048b3c22cc936fc46a9b3cdaec3199938efacfe +SHA512 (php-twig-1.43.0-597a03e.tgz) = 180753c8a65417903b6b3edd6bd7c6c5b6911071becbb6af958f7b7ddd42fc6e6495c4c8c1d792670a7e30323a35791a0cd232658385bead605b63e947433fc9 From 9c8677c003742c06261b8530f93389b31fd1df97 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 22:20:24 +0000 Subject: [PATCH 02/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 056dfe1..2f22651 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 @@ -185,6 +185,9 @@ exit $ret %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.43.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 6 2020 Remi Collet - 1.43.0-1 - update to 1.43.0 - raise dependency on PHP 7.1.3 From 3e01f2043a7227129afcfaf299a16aae6e8119b2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 11 Aug 2020 14:32:23 +0200 Subject: [PATCH 03/23] update to 1.43.1 switch to phpunit9 skip 1 more test with PHP 8.0 --- .gitignore | 1 + php-twig.spec | 42 ++++++++++++++++++++++++++---------------- sources | 2 +- 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 59e230a..cd77618 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ clog /php-twig-1.42.4-e587180.tgz /php-twig-1.42.5-87b2ea9.tgz /php-twig-1.43.0-597a03e.tgz +/php-twig-1.43.1-2311602.tgz diff --git a/php-twig.spec b/php-twig.spec index 2f22651..6765320 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -10,10 +10,13 @@ # Please preserve changelog entries # +# Build using "--without tests" to disable tests +%bcond_without tests + %global github_owner twigphp %global github_name Twig -%global github_version 1.43.0 -%global github_commit 597a03e85a60af6feee4f5127f3ef4279a1694c3 +%global github_version 1.43.1 +%global github_commit 2311602f6a208715252febe682fa7c38e56a3373 %global github_short %(c=%{github_commit}; echo ${c:0:7}) # Lib @@ -23,15 +26,12 @@ # "php": ">=7.1.3" %global php_min_ver 7.1.3 -# Build using "--without tests" to disable tests -%bcond_without tests - %{!?phpdir: %global phpdir %{_datadir}/php} %{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} Name: php-%{composer_project} Version: %{github_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: The flexible, fast, and secure template engine for PHP License: BSD @@ -43,7 +43,6 @@ BuildArch: noarch BuildRequires: php-devel >= %{php_min_ver} # Tests %if %{with tests} -BuildRequires: phpunit8 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(symfony/debug) >= 3.4 with php-composer(symfony/debug) < 4) BuildRequires: (php-composer(psr/container) >= 1.0 with php-composer(psr/container) < 2) @@ -52,6 +51,8 @@ BuildRequires: php-symfony3-debug >= 3.4 BuildRequires: php-composer(psr/container) < 2 BuildRequires: php-composer(psr/container) >= 1.0 %endif +%global phpunit %{_bindir}/phpunit9 +BuildRequires: %{phpunit} ## phpcompatinfo (computed from version 1.42.2) BuildRequires: php-ctype BuildRequires: php-date @@ -96,7 +97,7 @@ Provides: php-twig-Twig = %{version}-%{release} Provides: php-pear(pear.twig-project.org/Twig) = %{version} # This pkg was the only one in this channel so the channel is no longer needed -Obsoletes: php-channel-twig +Obsoletes: php-channel-twig < 1.4 %description @@ -162,15 +163,19 @@ sed -e '/listener/d' phpunit.xml.dist > phpunit.xml : Test suite without extension ret=0 -for cmd in php php72 php73 php74 php80; do - if which $cmd; then - $cmd %{_bindir}/phpunit8 \ - --filter '^((?!(testGetAttributeExceptions|testGetAttributeWithTemplateAsObject)).)*$' \ - --verbose || ret=1 - fi -done +for SCL in "php %{phpunit}" php73 php74 php80; do + if which $SCL; then + set $SCL + SKIP="--filter '^((?!(testResolveArgumentsWithMissingParameterForArbitraryArgumentsOnObject|testResolveArgumentsWithMissingParameterForArbitraryArgumentsOnFunction)).)*$'" -exit $ret + VER=$($1 -r 'echo PHP_VERSION_ID;') + [ $VER -ge 80000 ] && SKIP="--filter '^((?!(testResolveArgumentsWithMissingParameterForArbitraryArgumentsOnObject|testResolveArgumentsWithMissingParameterForArbitraryArgumentsOnFunction|testIntegration)).)*$'" + + $1 ${2:-%{_bindir}/phpunit9} $SKIP \ + --verbose || RETURN_CODE=1 + fi +done +exit $RETURN_CODE %else : Tests skipped %endif @@ -185,6 +190,11 @@ exit $ret %changelog +* Tue Aug 11 2020 Remi Collet - 1.43.1-1 +- update to 1.43.1 +- switch to phpunit9 +- skip 1 more test with PHP 8.0 + * Tue Jul 28 2020 Fedora Release Engineering - 1.43.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 004a912..6bb4d69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.43.0-597a03e.tgz) = 180753c8a65417903b6b3edd6bd7c6c5b6911071becbb6af958f7b7ddd42fc6e6495c4c8c1d792670a7e30323a35791a0cd232658385bead605b63e947433fc9 +SHA512 (php-twig-1.43.1-2311602.tgz) = 1ed632d7f0505aa00da9631c06ebe263a9cdb76ff940b27949e6f6188c15394e79d4f2fdfa527b7dc6f60d78df060b377fc8d4e7f1b25a312b1f7b0106758c61 From 045fccad74218564d9391ddb0e5e4a3d6b053e3e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 21 Oct 2020 15:44:50 +0200 Subject: [PATCH 04/23] update to 1.44.0 raise dependency on PHP 7.2.5 --- .gitignore | 1 + composer.json | 9 ++++----- php-twig.spec | 20 ++++++++++---------- sources | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index cd77618..0274cbd 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ clog /php-twig-1.42.5-87b2ea9.tgz /php-twig-1.43.0-597a03e.tgz /php-twig-1.43.1-2311602.tgz +/php-twig-1.44.0-e7c93a4.tgz diff --git a/composer.json b/composer.json index 9807aa7..46b0fc7 100644 --- a/composer.json +++ b/composer.json @@ -5,6 +5,7 @@ "keywords": ["templating"], "homepage": "https://twig.symfony.com", "license": "BSD-3-Clause", + "minimum-stability": "dev", "authors": [ { "name": "Fabien Potencier", @@ -14,7 +15,6 @@ }, { "name": "Twig Team", - "homepage": "https://twig.symfony.com/contributors", "role": "Contributors" }, { @@ -24,12 +24,11 @@ } ], "require": { - "php": ">=5.5.0", + "php": ">=7.2.5", "symfony/polyfill-ctype": "^1.8" }, "require-dev": { - "symfony/phpunit-bridge": "^4.4@dev|^5.0", - "symfony/debug": "^3.4|^4.2", + "symfony/phpunit-bridge": "^4.4.9|^5.0.9", "psr/container": "^1.0" }, "autoload": { @@ -47,7 +46,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.42-dev" + "dev-master": "1.44-dev" } } } diff --git a/php-twig.spec b/php-twig.spec index 6765320..5f46a9c 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -15,16 +15,16 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.43.1 -%global github_commit 2311602f6a208715252febe682fa7c38e56a3373 +%global github_version 1.44.0 +%global github_commit e7c93a4af5eba2b0b3cf51d540e0a131187d7410 %global github_short %(c=%{github_commit}; echo ${c:0:7}) # Lib %global composer_vendor twig %global composer_project twig -# "php": ">=7.1.3" -%global php_min_ver 7.1.3 +# "php": ">=7.2.5" +%global php_min_ver 7.2.5 %{!?phpdir: %global phpdir %{_datadir}/php} %{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} @@ -40,7 +40,8 @@ Source0: %{name}-%{github_version}-%{github_short}.tgz Source1: makesrc.sh BuildArch: noarch -BuildRequires: php-devel >= %{php_min_ver} +# as we use phpunit9 (for assertFileDoesNotExist) +BuildRequires: php-devel >= 7.3 # Tests %if %{with tests} %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 @@ -166,11 +167,6 @@ ret=0 for SCL in "php %{phpunit}" php73 php74 php80; do if which $SCL; then set $SCL - SKIP="--filter '^((?!(testResolveArgumentsWithMissingParameterForArbitraryArgumentsOnObject|testResolveArgumentsWithMissingParameterForArbitraryArgumentsOnFunction)).)*$'" - - VER=$($1 -r 'echo PHP_VERSION_ID;') - [ $VER -ge 80000 ] && SKIP="--filter '^((?!(testResolveArgumentsWithMissingParameterForArbitraryArgumentsOnObject|testResolveArgumentsWithMissingParameterForArbitraryArgumentsOnFunction|testIntegration)).)*$'" - $1 ${2:-%{_bindir}/phpunit9} $SKIP \ --verbose || RETURN_CODE=1 fi @@ -190,6 +186,10 @@ exit $RETURN_CODE %changelog +* Wed Oct 21 2020 Remi Collet - 1.44.0-1 +- update to 1.44.0 +- raise dependency on PHP 7.2.5 + * Tue Aug 11 2020 Remi Collet - 1.43.1-1 - update to 1.43.1 - switch to phpunit9 diff --git a/sources b/sources index 6bb4d69..9e2ac9e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.43.1-2311602.tgz) = 1ed632d7f0505aa00da9631c06ebe263a9cdb76ff940b27949e6f6188c15394e79d4f2fdfa527b7dc6f60d78df060b377fc8d4e7f1b25a312b1f7b0106758c61 +SHA512 (php-twig-1.44.0-e7c93a4.tgz) = fb92e6e52801b48d3485307ab085d574c484f649c9b33cbbc92c927af437bd91dabe3d4d68b98f919d1b1c5f9bd3ee20bbb7f5561a1a36cb855c967eb2016b7d From b585fe46149069e2ae917c6f58be298409117fb3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 28 Oct 2020 10:23:48 +0100 Subject: [PATCH 05/23] v1.44.1 --- .gitignore | 1 + php-twig.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0274cbd..509a83a 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ clog /php-twig-1.43.0-597a03e.tgz /php-twig-1.43.1-2311602.tgz /php-twig-1.44.0-e7c93a4.tgz +/php-twig-1.44.1-04b15d4.tgz diff --git a/php-twig.spec b/php-twig.spec index 5f46a9c..e27378e 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.0 -%global github_commit e7c93a4af5eba2b0b3cf51d540e0a131187d7410 +%global github_version 1.44.1 +%global github_commit 04b15d4c0bb18ddbf82626320ac07f6a73f199c9 %global github_short %(c=%{github_commit}; echo ${c:0:7}) # Lib @@ -186,6 +186,9 @@ exit $RETURN_CODE %changelog +* Wed Oct 28 2020 Remi Collet - 1.44.1-1 +- update to 1.44.1 + * Wed Oct 21 2020 Remi Collet - 1.44.0-1 - update to 1.44.0 - raise dependency on PHP 7.2.5 diff --git a/sources b/sources index 9e2ac9e..a444500 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.44.0-e7c93a4.tgz) = fb92e6e52801b48d3485307ab085d574c484f649c9b33cbbc92c927af437bd91dabe3d4d68b98f919d1b1c5f9bd3ee20bbb7f5561a1a36cb855c967eb2016b7d +SHA512 (php-twig-1.44.1-04b15d4.tgz) = fd4ac06f4e4ffc8f9739cea11cd2153d364d775d6872de9e0413b765029d1d456f90d0fbc97116730a37399430051e3f92ecc292d9ec2afa19b8d688558b1df7 From f5d02f81980b03950c871906c7903d58d3fc26a5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 6 Jan 2021 14:15:29 +0100 Subject: [PATCH 06/23] v1.44.2 --- .gitignore | 1 + php-twig.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 509a83a..473fc06 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ clog /php-twig-1.43.1-2311602.tgz /php-twig-1.44.0-e7c93a4.tgz /php-twig-1.44.1-04b15d4.tgz +/php-twig-1.44.2-138c493.tgz diff --git a/php-twig.spec b/php-twig.spec index e27378e..81f5d7c 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -1,7 +1,7 @@ # # Fedora spec file for php-twig # -# Copyright (c) 2014-2020 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.1 -%global github_commit 04b15d4c0bb18ddbf82626320ac07f6a73f199c9 +%global github_version 1.44.2 +%global github_commit 138c493c5b8ee7cff3821f80b8896d371366b5fe %global github_short %(c=%{github_commit}; echo ${c:0:7}) # Lib @@ -186,6 +186,9 @@ exit $RETURN_CODE %changelog +* Wed Jan 6 2021 Remi Collet - 1.44.2-1 +- update to 1.44.2 + * Wed Oct 28 2020 Remi Collet - 1.44.1-1 - update to 1.44.1 diff --git a/sources b/sources index a444500..ccd9643 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.44.1-04b15d4.tgz) = fd4ac06f4e4ffc8f9739cea11cd2153d364d775d6872de9e0413b765029d1d456f90d0fbc97116730a37399430051e3f92ecc292d9ec2afa19b8d688558b1df7 +SHA512 (php-twig-1.44.2-138c493.tgz) = 2a98e8c53c34a56d6989ebdc7033ce727be1dc4f46cc0c430e4bb5b60d02bbc990c1a37a97275dc5be0e42bbe762dc4da5f2595aaca1c17616be94f9d63cd41a From 721d04ea68b811e2c9cbac30803f3aed59d17378 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 07:56:56 +0000 Subject: [PATCH 07/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 81f5d7c..8d66bc7 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 @@ -186,6 +186,9 @@ exit $RETURN_CODE %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.44.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jan 6 2021 Remi Collet - 1.44.2-1 - update to 1.44.2 From aca2e6a88172b7c4558245f59e4636fae906f81a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 12 May 2021 12:23:11 +0200 Subject: [PATCH 08/23] v1.44.3 --- .gitignore | 1 + php-twig.spec | 16 ++++++---------- sources | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 473fc06..847bfea 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ clog /php-twig-1.44.0-e7c93a4.tgz /php-twig-1.44.1-04b15d4.tgz /php-twig-1.44.2-138c493.tgz +/php-twig-1.44.3-920a9b9.tgz diff --git a/php-twig.spec b/php-twig.spec index 8d66bc7..ed8e7c1 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.2 -%global github_commit 138c493c5b8ee7cff3821f80b8896d371366b5fe +%global github_version 1.44.3 +%global github_commit 920a9b9a616cdc3ee80dfee67cab5223a2cae7fa %global github_short %(c=%{github_commit}; echo ${c:0:7}) # Lib @@ -31,7 +31,7 @@ Name: php-%{composer_project} Version: %{github_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: The flexible, fast, and secure template engine for PHP License: BSD @@ -44,14 +44,8 @@ BuildArch: noarch BuildRequires: php-devel >= 7.3 # Tests %if %{with tests} -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(symfony/debug) >= 3.4 with php-composer(symfony/debug) < 4) BuildRequires: (php-composer(psr/container) >= 1.0 with php-composer(psr/container) < 2) -%else -BuildRequires: php-symfony3-debug >= 3.4 -BuildRequires: php-composer(psr/container) < 2 -BuildRequires: php-composer(psr/container) >= 1.0 -%endif %global phpunit %{_bindir}/phpunit9 BuildRequires: %{phpunit} ## phpcompatinfo (computed from version 1.42.2) @@ -178,7 +172,6 @@ exit $RETURN_CODE %files -%{!?_licensedir:%global license %%doc} %license LICENSE %doc CHANGELOG README.rst composer.json # Lib @@ -186,6 +179,9 @@ exit $RETURN_CODE %changelog +* Wed May 12 2021 Remi Collet - 1.44.3-1 +- update to 1.44.3 + * Wed Jan 27 2021 Fedora Release Engineering - 1.44.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index ccd9643..16ba5e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.44.2-138c493.tgz) = 2a98e8c53c34a56d6989ebdc7033ce727be1dc4f46cc0c430e4bb5b60d02bbc990c1a37a97275dc5be0e42bbe762dc4da5f2595aaca1c17616be94f9d63cd41a +SHA512 (php-twig-1.44.3-920a9b9.tgz) = 8943c8dda37ae61a6178cca317b0f79fb8aa592a71fd365861387a9c5fc20a2e2a8a65f5575e699a8782edf359609f696295939d382bead4c48c746570c27ea2 From 9a1c144dd270550b95fd9e9cc968731f4b2d4d9e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 17 May 2021 08:33:57 +0200 Subject: [PATCH 09/23] v1.44.4 --- .gitignore | 1 + php-twig.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 847bfea..d80e660 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ clog /php-twig-1.44.1-04b15d4.tgz /php-twig-1.44.2-138c493.tgz /php-twig-1.44.3-920a9b9.tgz +/php-twig-1.44.4-4d40042.tgz diff --git a/php-twig.spec b/php-twig.spec index ed8e7c1..07add6e 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.3 -%global github_commit 920a9b9a616cdc3ee80dfee67cab5223a2cae7fa +%global github_version 1.44.4 +%global github_commit 4d400421528e9fa40caaffcf7824c172526dd99d %global github_short %(c=%{github_commit}; echo ${c:0:7}) # Lib @@ -179,6 +179,9 @@ exit $RETURN_CODE %changelog +* Mon May 17 2021 Remi Collet - 1.44.4-1 +- update to 1.44.4 + * Wed May 12 2021 Remi Collet - 1.44.3-1 - update to 1.44.3 diff --git a/sources b/sources index 16ba5e3..06c0038 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.44.3-920a9b9.tgz) = 8943c8dda37ae61a6178cca317b0f79fb8aa592a71fd365861387a9c5fc20a2e2a8a65f5575e699a8782edf359609f696295939d382bead4c48c746570c27ea2 +SHA512 (php-twig-1.44.4-4d40042.tgz) = 286c44d96128d17c8132f997c2965a5265b99ed10c365803887408ef9f9d33d030bee2fb409401b73f9f05452ecad9a021687e8c0cc8904e96acbf4902a078f3 From 401dd1d9d6982da47bb0b14bff57648bb4bdc35f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 27 Jul 2021 07:36:07 +0000 Subject: [PATCH 10/23] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-twig.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/php-twig.spec b/php-twig.spec index 07add6e..0ff961d 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,10 @@ exit $RETURN_CODE %changelog +* Tue Jul 27 2021 Fedora Release Engineering - 1.44.4-2 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon May 17 2021 Remi Collet - 1.44.4-1 - update to 1.44.4 From 3060536c3591ff4a9a2a26d93f4d0a1661e361f3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 22 Sep 2021 11:39:29 +0200 Subject: [PATCH 11/23] update to 1.44.5 add patch for test suite from https://github.com/twigphp/Twig/pull/3563 --- .gitignore | 1 + 3563.patch | 23 +++++++++++++++++++++++ php-twig.spec | 13 ++++++++++--- sources | 2 +- 4 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 3563.patch diff --git a/.gitignore b/.gitignore index d80e660..8e79b5b 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ clog /php-twig-1.44.2-138c493.tgz /php-twig-1.44.3-920a9b9.tgz /php-twig-1.44.4-4d40042.tgz +/php-twig-1.44.5-dd43533.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 0ff961d..b73d649 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.4 -%global github_commit 4d400421528e9fa40caaffcf7824c172526dd99d +%global github_version 1.44.5 +%global github_commit dd4353357c5a116322e92a00d16043a31881a81e %global github_short %(c=%{github_commit}; echo ${c:0:7}) # Lib @@ -31,7 +31,7 @@ Name: php-%{composer_project} Version: %{github_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: The flexible, fast, and secure template engine for PHP License: BSD @@ -39,6 +39,8 @@ 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 @@ -114,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 @@ -179,6 +182,10 @@ exit $RETURN_CODE %changelog +* 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 + * Tue Jul 27 2021 Fedora Release Engineering - 1.44.4-2 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 06c0038..1b177e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.44.4-4d40042.tgz) = 286c44d96128d17c8132f997c2965a5265b99ed10c365803887408ef9f9d33d030bee2fb409401b73f9f05452ecad9a021687e8c0cc8904e96acbf4902a078f3 +SHA512 (php-twig-1.44.5-dd43533.tgz) = 11f329c437af2b8550a5812142918f5210c018b805e3c56d44c6934d4d8056d675621fec0e590240543816c71aa962a1b7c516b4b004eda971e7c58eb6b664df From 09f8249640574d5bc256a68238484d609d6e2872 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 25 Nov 2021 16:28:58 +0100 Subject: [PATCH 12/23] 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 13/23] - 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 14/23] 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 15/23] 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 16/23] 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 17/23] 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 18/23] 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 19/23] 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 20/23] 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 21/23] 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 22/23] 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 23/23] 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