From b26f058a216f6323f23c2fb7ca5d8c50db3b7f82 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 27 Oct 2016 14:05:56 +0200 Subject: [PATCH 01/68] v1.27.0 (API change) --- .gitignore | 1 + php-twig.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bd0f030..b65bc7f 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ clog /php-twig-1.24.2-33093f6e310e6976baeac7b14f3a6ec02f2d79b7.tar.gz /php-twig-1.26.0-81c2b5fd36581370c7731387f05dcdb577050513.tar.gz /php-twig-1.26.1-a09d8ee17ac1cfea29ed60c83960ad685c6a898d.tar.gz +/php-twig-1.27.0-3c6c0033fd3b5679c6e1cb60f4f9766c2b424d97.tar.gz diff --git a/php-twig.spec b/php-twig.spec index 41583cd..8d9350a 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,8 +12,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.26.1 -%global github_commit a09d8ee17ac1cfea29ed60c83960ad685c6a898d +%global github_version 1.27.0 +%global github_commit 3c6c0033fd3b5679c6e1cb60f4f9766c2b424d97 %if "%{php_version}" < "7" %global with_ext 1 @@ -274,6 +274,9 @@ sed 's/function testGetAttributeWithTemplateAsObject/function SKIP_testGetAttrib %changelog +* Wed Oct 26 2016 Remi Collet - 1.27.0-1 +- Update to 1.27.0 + * Thu Oct 6 2016 Remi Collet - 1.26.1-1 - Update to 1.26.1 diff --git a/sources b/sources index db17175..639df1f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -970c8ffa3ab068af746c9e166e70f8ae php-twig-1.26.1-a09d8ee17ac1cfea29ed60c83960ad685c6a898d.tar.gz +2760546655d65d4fa34115a158e4a472 php-twig-1.27.0-3c6c0033fd3b5679c6e1cb60f4f9766c2b424d97.tar.gz From 9972844e4624cabb819c5aa9ace88d3da15a55a6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 18 Nov 2016 07:44:15 +0100 Subject: [PATCH 02/68] v1.28.0 --- .gitignore | 1 + php-twig.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b65bc7f..53e915a 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ clog /php-twig-1.26.0-81c2b5fd36581370c7731387f05dcdb577050513.tar.gz /php-twig-1.26.1-a09d8ee17ac1cfea29ed60c83960ad685c6a898d.tar.gz /php-twig-1.27.0-3c6c0033fd3b5679c6e1cb60f4f9766c2b424d97.tar.gz +/php-twig-1.28.0-60ae30368f7ac50a95de032f16c1e882b0f69813.tar.gz diff --git a/php-twig.spec b/php-twig.spec index 8d9350a..f2ac9ad 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,8 +12,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.27.0 -%global github_commit 3c6c0033fd3b5679c6e1cb60f4f9766c2b424d97 +%global github_version 1.28.0 +%global github_commit 60ae30368f7ac50a95de032f16c1e882b0f69813 %if "%{php_version}" < "7" %global with_ext 1 @@ -274,6 +274,9 @@ sed 's/function testGetAttributeWithTemplateAsObject/function SKIP_testGetAttrib %changelog +* Fri Nov 18 2016 Remi Collet - 1.28.0-1 +- Update to 1.28.0 + * Wed Oct 26 2016 Remi Collet - 1.27.0-1 - Update to 1.27.0 diff --git a/sources b/sources index 639df1f..c37108c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2760546655d65d4fa34115a158e4a472 php-twig-1.27.0-3c6c0033fd3b5679c6e1cb60f4f9766c2b424d97.tar.gz +b7a43bd897c75a1b2ad57ae764405251 php-twig-1.28.0-60ae30368f7ac50a95de032f16c1e882b0f69813.tar.gz From 4cb656fe7503493da5d6e5d8d25f56ed1395f557 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 22 Nov 2016 15:00:28 +0100 Subject: [PATCH 03/68] v1.28.1 --- .gitignore | 1 + php-twig.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 53e915a..b06cdfb 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ clog /php-twig-1.26.1-a09d8ee17ac1cfea29ed60c83960ad685c6a898d.tar.gz /php-twig-1.27.0-3c6c0033fd3b5679c6e1cb60f4f9766c2b424d97.tar.gz /php-twig-1.28.0-60ae30368f7ac50a95de032f16c1e882b0f69813.tar.gz +/php-twig-1.28.1-fff80c4a7ae1d47a81dfec10c76cbcb939170b45.tar.gz diff --git a/php-twig.spec b/php-twig.spec index f2ac9ad..caa7144 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,8 +12,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.28.0 -%global github_commit 60ae30368f7ac50a95de032f16c1e882b0f69813 +%global github_version 1.28.1 +%global github_commit fff80c4a7ae1d47a81dfec10c76cbcb939170b45 %if "%{php_version}" < "7" %global with_ext 1 @@ -274,6 +274,9 @@ sed 's/function testGetAttributeWithTemplateAsObject/function SKIP_testGetAttrib %changelog +* Tue Nov 22 2016 Remi Collet - 1.28.1-1 +- Update to 1.28.1 + * Fri Nov 18 2016 Remi Collet - 1.28.0-1 - Update to 1.28.0 diff --git a/sources b/sources index c37108c..abb2d45 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b7a43bd897c75a1b2ad57ae764405251 php-twig-1.28.0-60ae30368f7ac50a95de032f16c1e882b0f69813.tar.gz +1fb0dc0ac877174347293830fae03b7a php-twig-1.28.1-fff80c4a7ae1d47a81dfec10c76cbcb939170b45.tar.gz From 7d599ef1aa2dfff0e19034d1e13c17dde65a0f70 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 24 Nov 2016 06:45:40 +0100 Subject: [PATCH 04/68] v1.28.2 --- .gitignore | 1 + php-twig.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index b06cdfb..09078d5 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ clog /php-twig-1.27.0-3c6c0033fd3b5679c6e1cb60f4f9766c2b424d97.tar.gz /php-twig-1.28.0-60ae30368f7ac50a95de032f16c1e882b0f69813.tar.gz /php-twig-1.28.1-fff80c4a7ae1d47a81dfec10c76cbcb939170b45.tar.gz +/php-twig-1.28.2-b22ce0eb070e41f7cba65d78fe216de29726459c.tar.gz diff --git a/php-twig.spec b/php-twig.spec index caa7144..7bd26f7 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,10 +12,10 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.28.1 -%global github_commit fff80c4a7ae1d47a81dfec10c76cbcb939170b45 +%global github_version 1.28.2 +%global github_commit b22ce0eb070e41f7cba65d78fe216de29726459c -%if "%{php_version}" < "7" +%if 0%{?fedora} < 25 %global with_ext 1 %else %global with_ext 0 @@ -232,6 +232,9 @@ EXT_VERSION=`grep PHP_TWIG_VERSION ext/NTS/php_twig.h | awk '{print $3}' | sed ' %endif %if %{with_tests} +: Disable listener from symfony/phpunit-bridge 3.2@dev +sed -e '/listener/d' phpunit.xml.dist > phpunit.xml + : Skip tests known to fail sed -e 's#function testGetAttributeExceptions#function SKIP_testGetAttributeExceptions#' \ -e 's/function testGetAttributeWithTemplateAsObject/function skip_testGetAttributeWithTemplateAsObject/' \ @@ -274,6 +277,9 @@ sed 's/function testGetAttributeWithTemplateAsObject/function SKIP_testGetAttrib %changelog +* Thu Nov 24 2016 Remi Collet - 1.28.2-1 +- Update to 1.28.2 + * Tue Nov 22 2016 Remi Collet - 1.28.1-1 - Update to 1.28.1 diff --git a/sources b/sources index abb2d45..4e394af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1fb0dc0ac877174347293830fae03b7a php-twig-1.28.1-fff80c4a7ae1d47a81dfec10c76cbcb939170b45.tar.gz +b11a343522cc3c51699f5dc0be6a2730 php-twig-1.28.2-b22ce0eb070e41f7cba65d78fe216de29726459c.tar.gz From b02ca15b6bfd2b7ca48248f024c0696766b3ef2e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 29 Dec 2016 08:08:09 +0100 Subject: [PATCH 05/68] v1.30.0 --- .gitignore | 1 + php-twig.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 09078d5..373576c 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ clog /php-twig-1.28.0-60ae30368f7ac50a95de032f16c1e882b0f69813.tar.gz /php-twig-1.28.1-fff80c4a7ae1d47a81dfec10c76cbcb939170b45.tar.gz /php-twig-1.28.2-b22ce0eb070e41f7cba65d78fe216de29726459c.tar.gz +/php-twig-1.30.0-c6ff71094fde15d12398eaba029434b013dc5e59.tar.gz diff --git a/php-twig.spec b/php-twig.spec index 7bd26f7..1064f15 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,8 +12,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.28.2 -%global github_commit b22ce0eb070e41f7cba65d78fe216de29726459c +%global github_version 1.30.0 +%global github_commit c6ff71094fde15d12398eaba029434b013dc5e59 %if 0%{?fedora} < 25 %global with_ext 1 @@ -277,6 +277,9 @@ sed 's/function testGetAttributeWithTemplateAsObject/function SKIP_testGetAttrib %changelog +* Thu Dec 29 2016 Remi Collet - 1.30.0-1 +- Update to 1.30.0 + * Thu Nov 24 2016 Remi Collet - 1.28.2-1 - Update to 1.28.2 diff --git a/sources b/sources index 4e394af..163e041 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b11a343522cc3c51699f5dc0be6a2730 php-twig-1.28.2-b22ce0eb070e41f7cba65d78fe216de29726459c.tar.gz +SHA512 (php-twig-1.30.0-c6ff71094fde15d12398eaba029434b013dc5e59.tar.gz) = 75404649cbb43f789f5da08d90c9d920faba802d188fc777e957fd2641be23b1a8f64f6a76b3d065f629141dca7fd981cf66ad043f203dfc26d8e403d7a9e3d0 From bb2d84e48742dcd948d32edb03b6195a5ed97971 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 12 Jan 2017 09:22:52 +0100 Subject: [PATCH 06/68] v1.31.0 --- php-twig.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/php-twig.spec b/php-twig.spec index 1064f15..7c02227 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,8 +12,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.30.0 -%global github_commit c6ff71094fde15d12398eaba029434b013dc5e59 +%global github_version 1.31.0 +%global github_commit ddc9e3e20ee9c0b6908f401ac8353635b750eca7 %if 0%{?fedora} < 25 %global with_ext 1 @@ -277,6 +277,9 @@ sed 's/function testGetAttributeWithTemplateAsObject/function SKIP_testGetAttrib %changelog +* Thu Jan 12 2017 Remi Collet - 1.31.0-1 +- Update to 1.31.0 + * Thu Dec 29 2016 Remi Collet - 1.30.0-1 - Update to 1.30.0 From 19c4f29659c2871721fa46ddbe8561357d0c0635 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 12 Jan 2017 09:25:52 +0100 Subject: [PATCH 07/68] v1.31.0 (sources) --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 373576c..1bf8c0b 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ clog /php-twig-1.28.1-fff80c4a7ae1d47a81dfec10c76cbcb939170b45.tar.gz /php-twig-1.28.2-b22ce0eb070e41f7cba65d78fe216de29726459c.tar.gz /php-twig-1.30.0-c6ff71094fde15d12398eaba029434b013dc5e59.tar.gz +/php-twig-1.31.0-ddc9e3e20ee9c0b6908f401ac8353635b750eca7.tar.gz diff --git a/sources b/sources index 163e041..b3cb9e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.30.0-c6ff71094fde15d12398eaba029434b013dc5e59.tar.gz) = 75404649cbb43f789f5da08d90c9d920faba802d188fc777e957fd2641be23b1a8f64f6a76b3d065f629141dca7fd981cf66ad043f203dfc26d8e403d7a9e3d0 +SHA512 (php-twig-1.31.0-ddc9e3e20ee9c0b6908f401ac8353635b750eca7.tar.gz) = 5f40063491d03d2c94fe29d8d1e7fd6c34237411984166c8b173696e82e34c56b019c1f491c394dc5bbbbb6b439b74b81869748cd93e64fda8405a88aa5ab78a From 4d6f0e46022eacbeeb2eb0a8ddfa426a4848d815 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 07:15:23 +0000 Subject: [PATCH 08/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- php-twig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-twig.spec b/php-twig.spec index 7c02227..f7c336e 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -46,7 +46,7 @@ BuildArch: noarch Name: php-%{composer_project} Version: %{github_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: The flexible, fast, and secure template engine for PHP Group: Development/Libraries @@ -277,6 +277,9 @@ sed 's/function testGetAttributeWithTemplateAsObject/function SKIP_testGetAttrib %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1.31.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Jan 12 2017 Remi Collet - 1.31.0-1 - Update to 1.31.0 From da6ffc2f4fb99d3e7f724b0395895528c265f535 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 2 Mar 2017 11:21:57 +0100 Subject: [PATCH 09/68] Update to 1.32.0 add build dependency on symfony/phpunit-bridge, symfony/debug and psr/container --- .gitignore | 1 + php-twig.spec | 39 +++++++++++++++++++++++++++++++-------- sources | 2 +- 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 1bf8c0b..96ffc9f 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ clog /php-twig-1.28.2-b22ce0eb070e41f7cba65d78fe216de29726459c.tar.gz /php-twig-1.30.0-c6ff71094fde15d12398eaba029434b013dc5e59.tar.gz /php-twig-1.31.0-ddc9e3e20ee9c0b6908f401ac8353635b750eca7.tar.gz +/php-twig-1.32.0-9935b662e24d6e634da88901ab534cc12e8c728f.tar.gz diff --git a/php-twig.spec b/php-twig.spec index f7c336e..1ca15a5 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -1,7 +1,7 @@ # # Fedora spec file for php-twig # -# Copyright (c) 2014-2016 Shawn Iwinski +# Copyright (c) 2014-2017 Shawn Iwinski # Remi Collet # # License: MIT @@ -12,8 +12,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.31.0 -%global github_commit ddc9e3e20ee9c0b6908f401ac8353635b750eca7 +%global github_version 1.32.0 +%global github_commit 9935b662e24d6e634da88901ab534cc12e8c728f %if 0%{?fedora} < 25 %global with_ext 1 @@ -57,7 +57,10 @@ Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{githu BuildRequires: php-devel >= %{php_min_ver} # Tests %if %{with_tests} -BuildRequires: %{_bindir}/phpunit +BuildRequires: php-composer(phpunit/phpunit) +BuildRequires: php-composer(symfony/phpunit-bridge) +BuildRequires: php-composer(symfony/debug) >= 2.7 +BuildRequires: php-composer(psr/container) >= 1.0 ## phpcompatinfo (computed from version 1.26.0) BuildRequires: php-ctype BuildRequires: php-date @@ -232,8 +235,23 @@ EXT_VERSION=`grep PHP_TWIG_VERSION ext/NTS/php_twig.h | awk '{print $3}' | sed ' %endif %if %{with_tests} -: Disable listener from symfony/phpunit-bridge 3.2@dev -sed -e '/listener/d' phpunit.xml.dist > phpunit.xml +: Generate autoloader +mkdir vendor +cat << 'EOF' | tee vendor/autoload.php + phpunit.xml +fi : Skip tests known to fail sed -e 's#function testGetAttributeExceptions#function SKIP_testGetAttributeExceptions#' \ @@ -245,12 +263,12 @@ sed 's/function testGetAttributeWithTemplateAsObject/function SKIP_testGetAttrib %endif : Test suite without extension -%{_bindir}/phpunit --bootstrap %{buildroot}%{phpdir}/Twig/autoload.php --verbose +%{_bindir}/phpunit --verbose %if %{with_ext} : Test suite with extension %{_bindir}/php --define extension=ext/NTS/modules/%{ext_name}.so \ - %{_bindir}/phpunit --bootstrap %{buildroot}%{phpdir}/Twig/autoload.php --verbose + %{_bindir}/phpunit --verbose %endif %else : Tests skipped @@ -277,6 +295,11 @@ sed 's/function testGetAttributeWithTemplateAsObject/function SKIP_testGetAttrib %changelog +* Mon Feb 27 2017 Remi Collet - 1.32.0-1 +- Update to 1.32.0 +- add build dependency on symfony/phpunit-bridge, symfony/debug + and psr/container + * Sat Feb 11 2017 Fedora Release Engineering - 1.31.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index b3cb9e0..e5c58fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.31.0-ddc9e3e20ee9c0b6908f401ac8353635b750eca7.tar.gz) = 5f40063491d03d2c94fe29d8d1e7fd6c34237411984166c8b173696e82e34c56b019c1f491c394dc5bbbbb6b439b74b81869748cd93e64fda8405a88aa5ab78a +SHA512 (php-twig-1.32.0-9935b662e24d6e634da88901ab534cc12e8c728f.tar.gz) = 6083241624d3fb34c2ccb384b03ff1463a67a81f580719479d9c4212bd2566871662097b4698a553a52bd0700167424ef4a49c7a4e083df32ee2cf2d82d00cea From b8dff0f570e16de645d82e40527c639722f329c2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 23 Mar 2017 07:15:47 +0100 Subject: [PATCH 10/68] v1.33.0 --- .gitignore | 1 + php-twig.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 96ffc9f..91cd012 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ clog /php-twig-1.30.0-c6ff71094fde15d12398eaba029434b013dc5e59.tar.gz /php-twig-1.31.0-ddc9e3e20ee9c0b6908f401ac8353635b750eca7.tar.gz /php-twig-1.32.0-9935b662e24d6e634da88901ab534cc12e8c728f.tar.gz +/php-twig-1.33.0-05cf49921b13f6f01d3cfdf9018cfa7a8086fd5a.tar.gz diff --git a/php-twig.spec b/php-twig.spec index 1ca15a5..62410c9 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,8 +12,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.32.0 -%global github_commit 9935b662e24d6e634da88901ab534cc12e8c728f +%global github_version 1.33.0 +%global github_commit 05cf49921b13f6f01d3cfdf9018cfa7a8086fd5a %if 0%{?fedora} < 25 %global with_ext 1 @@ -295,6 +295,9 @@ sed 's/function testGetAttributeWithTemplateAsObject/function SKIP_testGetAttrib %changelog +* Thu Mar 23 2017 Remi Collet - 1.33.0-1 +- Update to 1.33.0 + * Mon Feb 27 2017 Remi Collet - 1.32.0-1 - Update to 1.32.0 - add build dependency on symfony/phpunit-bridge, symfony/debug diff --git a/sources b/sources index e5c58fe..7bf569c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.32.0-9935b662e24d6e634da88901ab534cc12e8c728f.tar.gz) = 6083241624d3fb34c2ccb384b03ff1463a67a81f580719479d9c4212bd2566871662097b4698a553a52bd0700167424ef4a49c7a4e083df32ee2cf2d82d00cea +SHA512 (php-twig-1.33.0-05cf49921b13f6f01d3cfdf9018cfa7a8086fd5a.tar.gz) = b97062736c475f80518f47319a7a93e62273f8f45043108d11e9cfa1bc03d07149d27a4e68749faabe48a2d0655e3dc0714a3da17b426e3aec9fc1abac6e590a From be1a76fbca7a0972c9c88f452d7a5c410275a6a9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 24 Apr 2017 16:39:55 +0200 Subject: [PATCH 11/68] v1.33.2 --- .gitignore | 1 + php-twig.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 91cd012..35aab8e 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ clog /php-twig-1.31.0-ddc9e3e20ee9c0b6908f401ac8353635b750eca7.tar.gz /php-twig-1.32.0-9935b662e24d6e634da88901ab534cc12e8c728f.tar.gz /php-twig-1.33.0-05cf49921b13f6f01d3cfdf9018cfa7a8086fd5a.tar.gz +/php-twig-1.33.2-dd6ca96227917e1e85b41c7c3cc6507b411e0927.tar.gz diff --git a/php-twig.spec b/php-twig.spec index 62410c9..020dfa0 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,8 +12,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.33.0 -%global github_commit 05cf49921b13f6f01d3cfdf9018cfa7a8086fd5a +%global github_version 1.33.2 +%global github_commit dd6ca96227917e1e85b41c7c3cc6507b411e0927 %if 0%{?fedora} < 25 %global with_ext 1 @@ -46,7 +46,7 @@ BuildArch: noarch Name: php-%{composer_project} Version: %{github_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: The flexible, fast, and secure template engine for PHP Group: Development/Libraries @@ -295,6 +295,9 @@ sed 's/function testGetAttributeWithTemplateAsObject/function SKIP_testGetAttrib %changelog +* Mon Apr 24 2017 Remi Collet - 1.33.2-1 +- Update to 1.33.2 + * Thu Mar 23 2017 Remi Collet - 1.33.0-1 - Update to 1.33.0 diff --git a/sources b/sources index 7bf569c..39ba112 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.33.0-05cf49921b13f6f01d3cfdf9018cfa7a8086fd5a.tar.gz) = b97062736c475f80518f47319a7a93e62273f8f45043108d11e9cfa1bc03d07149d27a4e68749faabe48a2d0655e3dc0714a3da17b426e3aec9fc1abac6e590a +SHA512 (php-twig-1.33.2-dd6ca96227917e1e85b41c7c3cc6507b411e0927.tar.gz) = b0e958760cba881ec4b04018b79d86a6b76b317803f9655a549d7eee41e5daaf3991885e5b77b804a036cfa429f0a23a1fa7e66d57e318ab991ca313b88d94d3 From 5bf2e25d8feb17c4eaa68e738fb0bac083da065a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 6 Jun 2017 10:09:13 +0200 Subject: [PATCH 12/68] Update to 1.34.2 raise dependency on PHP 5.3.3 add namespaced compat library switch to fedora/autoloader drop build dependency on symfony/phpunit-bridge --- .gitignore | 1 + php-twig.spec | 72 ++++++++++++++++++++++++++++----------------------- sources | 2 +- 3 files changed, 42 insertions(+), 33 deletions(-) diff --git a/.gitignore b/.gitignore index 35aab8e..b09c9f9 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ clog /php-twig-1.32.0-9935b662e24d6e634da88901ab534cc12e8c728f.tar.gz /php-twig-1.33.0-05cf49921b13f6f01d3cfdf9018cfa7a8086fd5a.tar.gz /php-twig-1.33.2-dd6ca96227917e1e85b41c7c3cc6507b411e0927.tar.gz +/php-twig-1.34.2-55e4beb721a044db9e31ae0470024fc205b6a008.tar.gz diff --git a/php-twig.spec b/php-twig.spec index 020dfa0..0e198c5 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,8 +12,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.33.2 -%global github_commit dd6ca96227917e1e85b41c7c3cc6507b411e0927 +%global github_version 1.34.2 +%global github_commit 55e4beb721a044db9e31ae0470024fc205b6a008 %if 0%{?fedora} < 25 %global with_ext 1 @@ -58,10 +58,11 @@ BuildRequires: php-devel >= %{php_min_ver} # Tests %if %{with_tests} BuildRequires: php-composer(phpunit/phpunit) -BuildRequires: php-composer(symfony/phpunit-bridge) +BuildRequires: php-composer(symfony/debug) < 3 BuildRequires: php-composer(symfony/debug) >= 2.7 +BuildRequires: php-composer(psr/container) < 2 BuildRequires: php-composer(psr/container) >= 1.0 -## phpcompatinfo (computed from version 1.26.0) +## phpcompatinfo (computed from version 1.34.2) BuildRequires: php-ctype BuildRequires: php-date BuildRequires: php-dom @@ -73,11 +74,13 @@ BuildRequires: php-pcre BuildRequires: php-reflection BuildRequires: php-spl %endif +# Autoloader +BuildRequires: php-fedora-autoloader-devel # Lib ## composer.json Requires: php(language) >= %{php_min_ver} -## phpcompatinfo (computed from version 1.26.0) +## phpcompatinfo (computed from version 1.34.2) Requires: php-ctype Requires: php-date Requires: php-dom @@ -93,6 +96,8 @@ Requires: php-spl Requires: php(zend-abi) = %{php_zend_api} Requires: php(api) = %{php_core_api} %endif +# Autoloader +Requires: php-composer(fedora/autoloader) # Lib ## Composer @@ -157,21 +162,11 @@ extension=%{ext_name}.so INI %endif +: Move the PSR-4 compat library +mv src lib/Twig/psr4 + : Create lib autoloader -cat <<'AUTOLOAD' | tee lib/Twig/autoload.php - phpunit.xml -fi +: Disable listener from symfony/phpunit-bridge ~3.2 +sed -e '/listener/d' phpunit.xml.dist > phpunit.xml : Skip tests known to fail sed -e 's#function testGetAttributeExceptions#function SKIP_testGetAttributeExceptions#' \ @@ -263,13 +257,20 @@ sed 's/function testGetAttributeWithTemplateAsObject/function SKIP_testGetAttrib %endif : Test suite without extension -%{_bindir}/phpunit --verbose +ret=0 +for cmd in php php56 php70 php71 php72; do + if which $cmd; then + $cmd %{_bindir}/phpunit --verbose || ret=1 + fi +done %if %{with_ext} : Test suite with extension %{_bindir}/php --define extension=ext/NTS/modules/%{ext_name}.so \ - %{_bindir}/phpunit --verbose + %{_bindir}/phpunit --verbose || ret=1 %endif + +exit $ret %else : Tests skipped %endif @@ -295,6 +296,13 @@ sed 's/function testGetAttributeWithTemplateAsObject/function SKIP_testGetAttrib %changelog +* Tue Jun 6 2017 Remi Collet - 1.34.2-1 +- Update to 1.34.2 +- raise dependency on PHP 5.3.3 +- add namespaced compat library +- switch to fedora/autoloader +- drop build dependency on symfony/phpunit-bridge + * Mon Apr 24 2017 Remi Collet - 1.33.2-1 - Update to 1.33.2 diff --git a/sources b/sources index 39ba112..b6bcd3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.33.2-dd6ca96227917e1e85b41c7c3cc6507b411e0927.tar.gz) = b0e958760cba881ec4b04018b79d86a6b76b317803f9655a549d7eee41e5daaf3991885e5b77b804a036cfa429f0a23a1fa7e66d57e318ab991ca313b88d94d3 +SHA512 (php-twig-1.34.2-55e4beb721a044db9e31ae0470024fc205b6a008.tar.gz) = 290e0fcb479ab4684945efb03295e8901a5f755ccabaed524c88b48dc455c94c89d853e93899b003aa106c59e1944df6bcec45beb21105e4d12115118e470258 From 0b4a7e5df75a9972b5c2a22c932d8cc052eefcf1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 8 Jun 2017 07:27:56 +0200 Subject: [PATCH 13/68] v1.34.3 --- .gitignore | 1 + php-twig.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b09c9f9..9be34b0 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ clog /php-twig-1.33.0-05cf49921b13f6f01d3cfdf9018cfa7a8086fd5a.tar.gz /php-twig-1.33.2-dd6ca96227917e1e85b41c7c3cc6507b411e0927.tar.gz /php-twig-1.34.2-55e4beb721a044db9e31ae0470024fc205b6a008.tar.gz +/php-twig-1.34.3-451c6f4197e113e24c1c85bc3fc8c2d77adeff2e.tar.gz diff --git a/php-twig.spec b/php-twig.spec index 0e198c5..cb1b14c 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,8 +12,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.34.2 -%global github_commit 55e4beb721a044db9e31ae0470024fc205b6a008 +%global github_version 1.34.3 +%global github_commit 451c6f4197e113e24c1c85bc3fc8c2d77adeff2e %if 0%{?fedora} < 25 %global with_ext 1 @@ -296,6 +296,9 @@ exit $ret %changelog +* Thu Jun 8 2017 Remi Collet - 1.34.3-1 +- Update to 1.34.3 + * Tue Jun 6 2017 Remi Collet - 1.34.2-1 - Update to 1.34.2 - raise dependency on PHP 5.3.3 diff --git a/sources b/sources index b6bcd3c..70c14cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.34.2-55e4beb721a044db9e31ae0470024fc205b6a008.tar.gz) = 290e0fcb479ab4684945efb03295e8901a5f755ccabaed524c88b48dc455c94c89d853e93899b003aa106c59e1944df6bcec45beb21105e4d12115118e470258 +SHA512 (php-twig-1.34.3-451c6f4197e113e24c1c85bc3fc8c2d77adeff2e.tar.gz) = 02ca2db7030e715ab35e9eae277cd4fab54639e7f2142f3270d725a3bfae21fb27caaff3c5320634fbfa65372cb52641254139818176e4115917f998713598cb From 414c2cdf3871ea087bb0eee2f89eb8ae1803a9c2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 5 Jul 2017 08:03:32 +0200 Subject: [PATCH 14/68] v1.34.4 --- .gitignore | 1 + php-twig.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9be34b0..931e605 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ clog /php-twig-1.33.2-dd6ca96227917e1e85b41c7c3cc6507b411e0927.tar.gz /php-twig-1.34.2-55e4beb721a044db9e31ae0470024fc205b6a008.tar.gz /php-twig-1.34.3-451c6f4197e113e24c1c85bc3fc8c2d77adeff2e.tar.gz +/php-twig-1.34.4-f878bab48edb66ad9c6ed626bf817f60c6c096ee.tar.gz diff --git a/php-twig.spec b/php-twig.spec index cb1b14c..116fa65 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,8 +12,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.34.3 -%global github_commit 451c6f4197e113e24c1c85bc3fc8c2d77adeff2e +%global github_version 1.34.4 +%global github_commit f878bab48edb66ad9c6ed626bf817f60c6c096ee %if 0%{?fedora} < 25 %global with_ext 1 @@ -296,6 +296,9 @@ exit $ret %changelog +* Wed Jul 5 2017 Remi Collet - 1.34.4-1 +- Update to 1.34.4 + * Thu Jun 8 2017 Remi Collet - 1.34.3-1 - Update to 1.34.3 diff --git a/sources b/sources index 70c14cf..6cf5982 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.34.3-451c6f4197e113e24c1c85bc3fc8c2d77adeff2e.tar.gz) = 02ca2db7030e715ab35e9eae277cd4fab54639e7f2142f3270d725a3bfae21fb27caaff3c5320634fbfa65372cb52641254139818176e4115917f998713598cb +SHA512 (php-twig-1.34.4-f878bab48edb66ad9c6ed626bf817f60c6c096ee.tar.gz) = 9c37a218765198be18200c8002d8862e2b3205b04c299fb9e79935a89ae624f6e5946fda601033197ab4ea5328fa6205566c29fe741338ab2c56e065bc43af85 From 2fb0fb27d76ae70da8c8b028d81c2ce67a7e760f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 7 Jul 2017 13:10:16 +0200 Subject: [PATCH 15/68] Rebuild due to bug in RPM (RHBZ #1468476) Signed-off-by: Igor Gnatenko --- php-twig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-twig.spec b/php-twig.spec index 116fa65..055ebcc 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -46,7 +46,7 @@ BuildArch: noarch Name: php-%{composer_project} Version: %{github_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: The flexible, fast, and secure template engine for PHP Group: Development/Libraries @@ -296,6 +296,9 @@ exit $ret %changelog +* Fri Jul 07 2017 Igor Gnatenko - 1.34.4-2 +- Rebuild due to bug in RPM (RHBZ #1468476) + * Wed Jul 5 2017 Remi Collet - 1.34.4-1 - Update to 1.34.4 From 555fa4450dca3daf80789ee3fea7377b6be4ec69 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 08:22:46 +0000 Subject: [PATCH 16/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- php-twig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-twig.spec b/php-twig.spec index 055ebcc..821a90b 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -46,7 +46,7 @@ BuildArch: noarch Name: php-%{composer_project} Version: %{github_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: The flexible, fast, and secure template engine for PHP Group: Development/Libraries @@ -296,6 +296,9 @@ exit $ret %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.34.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Jul 07 2017 Igor Gnatenko - 1.34.4-2 - Rebuild due to bug in RPM (RHBZ #1468476) From 1e965880bdd0526257de12df87888cb61e99dfcc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 28 Sep 2017 07:39:34 +0200 Subject: [PATCH 17/68] v1.35.0 --- .gitignore | 1 + php-twig.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 931e605..c55c500 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ clog /php-twig-1.34.2-55e4beb721a044db9e31ae0470024fc205b6a008.tar.gz /php-twig-1.34.3-451c6f4197e113e24c1c85bc3fc8c2d77adeff2e.tar.gz /php-twig-1.34.4-f878bab48edb66ad9c6ed626bf817f60c6c096ee.tar.gz +/php-twig-1.35.0-daa657073e55b0a78cce8fdd22682fddecc6385f.tar.gz diff --git a/php-twig.spec b/php-twig.spec index 821a90b..6857057 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,8 +12,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.34.4 -%global github_commit f878bab48edb66ad9c6ed626bf817f60c6c096ee +%global github_version 1.35.0 +%global github_commit daa657073e55b0a78cce8fdd22682fddecc6385f %if 0%{?fedora} < 25 %global with_ext 1 @@ -46,7 +46,7 @@ BuildArch: noarch Name: php-%{composer_project} Version: %{github_version} -Release: 3%{?dist} +Release: 1%{?dist} Summary: The flexible, fast, and secure template engine for PHP Group: Development/Libraries @@ -296,6 +296,9 @@ exit $ret %changelog +* Thu Sep 28 2017 Remi Collet - 1.35.0-1 +- Update to 1.35.0 + * Thu Jul 27 2017 Fedora Release Engineering - 1.34.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index 6cf5982..ccf646c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.34.4-f878bab48edb66ad9c6ed626bf817f60c6c096ee.tar.gz) = 9c37a218765198be18200c8002d8862e2b3205b04c299fb9e79935a89ae624f6e5946fda601033197ab4ea5328fa6205566c29fe741338ab2c56e065bc43af85 +SHA512 (php-twig-1.35.0-daa657073e55b0a78cce8fdd22682fddecc6385f.tar.gz) = f237aab6edf4ddf4abf8fbfb82c3b3ef37b9589f749c0c8795268ef3641de6d90e714fa934609b3ba74ca96cb42b5ca951e8bf5eb2007f5fb20330250d8ec808 From d4013f6e42c83414ba8a495d95b6ee97e8a75ce4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 04:40:55 +0000 Subject: [PATCH 18/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_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 6857057..5da125c 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -46,7 +46,7 @@ BuildArch: noarch Name: php-%{composer_project} Version: %{github_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: The flexible, fast, and secure template engine for PHP Group: Development/Libraries @@ -296,6 +296,9 @@ exit $ret %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.35.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Sep 28 2017 Remi Collet - 1.35.0-1 - Update to 1.35.0 From 5bd187f8f54ad42ff37e7f7f67a3934c37ec8cb1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 3 Mar 2018 07:25:17 +0100 Subject: [PATCH 19/68] Update to 1.35.1 use range dependencies on F27+ --- .gitignore | 1 + php-twig.spec | 18 +++++++++++++----- sources | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index c55c500..43fcf2b 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ clog /php-twig-1.34.3-451c6f4197e113e24c1c85bc3fc8c2d77adeff2e.tar.gz /php-twig-1.34.4-f878bab48edb66ad9c6ed626bf817f60c6c096ee.tar.gz /php-twig-1.35.0-daa657073e55b0a78cce8fdd22682fddecc6385f.tar.gz +/php-twig-1.35.1-ffda54d85cc3aec3ba499c8c0eda9b2176edfe83.tar.gz diff --git a/php-twig.spec b/php-twig.spec index 5da125c..e2e3136 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -1,7 +1,7 @@ # # Fedora spec file for php-twig # -# Copyright (c) 2014-2017 Shawn Iwinski +# Copyright (c) 2014-2018 Shawn Iwinski # Remi Collet # # License: MIT @@ -12,8 +12,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.35.0 -%global github_commit daa657073e55b0a78cce8fdd22682fddecc6385f +%global github_version 1.35.1 +%global github_commit ffda54d85cc3aec3ba499c8c0eda9b2176edfe83 %if 0%{?fedora} < 25 %global with_ext 1 @@ -58,10 +58,14 @@ BuildRequires: php-devel >= %{php_min_ver} # Tests %if %{with_tests} BuildRequires: php-composer(phpunit/phpunit) -BuildRequires: php-composer(symfony/debug) < 3 -BuildRequires: php-composer(symfony/debug) >= 2.7 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(symfony/debug) >= 2.7 with php-composer(symfony/debug) < 3) +BuildRequires: (php-composer(psr/container) >= 1.0 with php-composer(psr/container) < 2) +%else +BuildRequires: php-symfony-debug >= 2.7 BuildRequires: php-composer(psr/container) < 2 BuildRequires: php-composer(psr/container) >= 1.0 +%endif ## phpcompatinfo (computed from version 1.34.2) BuildRequires: php-ctype BuildRequires: php-date @@ -296,6 +300,10 @@ exit $ret %changelog +* Sat Mar 3 2018 Remi Collet - 1.35.1-1 +- Update to 1.35.1 +- use range dependencies on F27+ + * Fri Feb 09 2018 Fedora Release Engineering - 1.35.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index ccf646c..a143436 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.35.0-daa657073e55b0a78cce8fdd22682fddecc6385f.tar.gz) = f237aab6edf4ddf4abf8fbfb82c3b3ef37b9589f749c0c8795268ef3641de6d90e714fa934609b3ba74ca96cb42b5ca951e8bf5eb2007f5fb20330250d8ec808 +SHA512 (php-twig-1.35.1-ffda54d85cc3aec3ba499c8c0eda9b2176edfe83.tar.gz) = ed92ff3c5b8d5c455b2cb9ea956e8f984a392a14d6567f7f92b7741d47c5d051407272649a78eee52b698e75de96504b0f490bbc57da9d4a439d9dc3d8846454 From 055ed11eb2936f7ba5996c5dfd39a1e0164729b2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 5 Mar 2018 08:22:01 +0100 Subject: [PATCH 20/68] v1.35.2 --- .gitignore | 1 + php-twig.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 43fcf2b..2596453 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ clog /php-twig-1.34.4-f878bab48edb66ad9c6ed626bf817f60c6c096ee.tar.gz /php-twig-1.35.0-daa657073e55b0a78cce8fdd22682fddecc6385f.tar.gz /php-twig-1.35.1-ffda54d85cc3aec3ba499c8c0eda9b2176edfe83.tar.gz +/php-twig-1.35.2-9c24f2cd39dc1906b76879e099970b7e53724601.tar.gz diff --git a/php-twig.spec b/php-twig.spec index e2e3136..edca87b 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,8 +12,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.35.1 -%global github_commit ffda54d85cc3aec3ba499c8c0eda9b2176edfe83 +%global github_version 1.35.2 +%global github_commit 9c24f2cd39dc1906b76879e099970b7e53724601 %if 0%{?fedora} < 25 %global with_ext 1 @@ -300,6 +300,9 @@ exit $ret %changelog +* Sun Mar 4 2018 Remi Collet - 1.35.2-1 +- Update to 1.35.2 + * Sat Mar 3 2018 Remi Collet - 1.35.1-1 - Update to 1.35.1 - use range dependencies on F27+ diff --git a/sources b/sources index a143436..923b3e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.35.1-ffda54d85cc3aec3ba499c8c0eda9b2176edfe83.tar.gz) = ed92ff3c5b8d5c455b2cb9ea956e8f984a392a14d6567f7f92b7741d47c5d051407272649a78eee52b698e75de96504b0f490bbc57da9d4a439d9dc3d8846454 +SHA512 (php-twig-1.35.2-9c24f2cd39dc1906b76879e099970b7e53724601.tar.gz) = 5d0f05a88b70fe356f24eb7f34211bb7719ed85a3f0924d253f2ceb307eabf6027d15218b00b7d14451a67c1778434de815a721ccb2194a904af0ef1b3824fd8 From 2a96df8f89c69f74e652f1679d8a30b46a6a453f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 20 Mar 2018 14:44:23 +0100 Subject: [PATCH 21/68] v1.35.3 --- .gitignore | 1 + php-twig.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2596453..362139c 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ clog /php-twig-1.35.0-daa657073e55b0a78cce8fdd22682fddecc6385f.tar.gz /php-twig-1.35.1-ffda54d85cc3aec3ba499c8c0eda9b2176edfe83.tar.gz /php-twig-1.35.2-9c24f2cd39dc1906b76879e099970b7e53724601.tar.gz +/php-twig-1.35.3-b48680b6eb7d16b5025b9bfc4108d86f6b8af86f.tar.gz diff --git a/php-twig.spec b/php-twig.spec index edca87b..756d0bc 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,8 +12,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.35.2 -%global github_commit 9c24f2cd39dc1906b76879e099970b7e53724601 +%global github_version 1.35.3 +%global github_commit b48680b6eb7d16b5025b9bfc4108d86f6b8af86f %if 0%{?fedora} < 25 %global with_ext 1 @@ -46,7 +46,7 @@ BuildArch: noarch Name: php-%{composer_project} Version: %{github_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: The flexible, fast, and secure template engine for PHP Group: Development/Libraries @@ -300,6 +300,9 @@ exit $ret %changelog +* Tue Mar 20 2018 Remi Collet - 1.35.3-1 +- update to 1.35.3 + * Sun Mar 4 2018 Remi Collet - 1.35.2-1 - Update to 1.35.2 diff --git a/sources b/sources index 923b3e6..a8eca8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.35.2-9c24f2cd39dc1906b76879e099970b7e53724601.tar.gz) = 5d0f05a88b70fe356f24eb7f34211bb7719ed85a3f0924d253f2ceb307eabf6027d15218b00b7d14451a67c1778434de815a721ccb2194a904af0ef1b3824fd8 +SHA512 (php-twig-1.35.3-b48680b6eb7d16b5025b9bfc4108d86f6b8af86f.tar.gz) = 47f6d5d7deddf563c7d73e8b01b187a7a8add7b6cea63077ed1bb4dd2f6c69dc18cb0e12a74fc1e5ea86e43fe0a981a0f88e8ca1ee33e4a97bb07696ce5c4b47 From 76ffea34c667515b617b32d436abce5a774730b4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 13 Jul 2018 13:35:49 +0200 Subject: [PATCH 22/68] v1.35.4 --- .gitignore | 1 + php-twig.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 362139c..9f9c10d 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ clog /php-twig-1.35.1-ffda54d85cc3aec3ba499c8c0eda9b2176edfe83.tar.gz /php-twig-1.35.2-9c24f2cd39dc1906b76879e099970b7e53724601.tar.gz /php-twig-1.35.3-b48680b6eb7d16b5025b9bfc4108d86f6b8af86f.tar.gz +/php-twig-1.35.4-7e081e98378a1e78c29cc9eba4aefa5d78a05d2a.tar.gz diff --git a/php-twig.spec b/php-twig.spec index 756d0bc..6da347e 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,8 +12,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.35.3 -%global github_commit b48680b6eb7d16b5025b9bfc4108d86f6b8af86f +%global github_version 1.35.4 +%global github_commit 7e081e98378a1e78c29cc9eba4aefa5d78a05d2a %if 0%{?fedora} < 25 %global with_ext 1 @@ -262,7 +262,7 @@ sed 's/function testGetAttributeWithTemplateAsObject/function SKIP_testGetAttrib : Test suite without extension ret=0 -for cmd in php php56 php70 php71 php72; do +for cmd in php php56 php70 php71 php72 php73; do if which $cmd; then $cmd %{_bindir}/phpunit --verbose || ret=1 fi @@ -300,6 +300,9 @@ exit $ret %changelog +* Fri Jul 13 2018 Remi Collet - 1.35.4-1 +- update to 1.35.4 + * Tue Mar 20 2018 Remi Collet - 1.35.3-1 - update to 1.35.3 diff --git a/sources b/sources index a8eca8a..2d15da8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.35.3-b48680b6eb7d16b5025b9bfc4108d86f6b8af86f.tar.gz) = 47f6d5d7deddf563c7d73e8b01b187a7a8add7b6cea63077ed1bb4dd2f6c69dc18cb0e12a74fc1e5ea86e43fe0a981a0f88e8ca1ee33e4a97bb07696ce5c4b47 +SHA512 (php-twig-1.35.4-7e081e98378a1e78c29cc9eba4aefa5d78a05d2a.tar.gz) = 776e8bfb322bf9e029a24f36f1b4f66867bec5fd4ba2e1ef9a0ce1119d9d01310aa123664b003833a1c9548fb076745c1a380441a402ba9cb4ea1f741282a587 From 993e69cc80be3948982b8924326ab16d0f8ef2e2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 18 Dec 2018 10:42:51 +0100 Subject: [PATCH 23/68] v1.36.0 --- php-twig.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/php-twig.spec b/php-twig.spec index 6da347e..e28ebba 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,10 +12,10 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.35.4 -%global github_commit 7e081e98378a1e78c29cc9eba4aefa5d78a05d2a +%global github_version 1.36.0 +%global github_commit 730c9c4471b5152d23061feb02b03382264c8a15 -%if 0%{?fedora} < 25 +%if 0%{?fedora} < 25 && 0%{?rhel} < 8 %global with_ext 1 %else %global with_ext 0 @@ -300,6 +300,9 @@ exit $ret %changelog +* Tue Dec 18 2018 Remi Collet - 1.36.0-1 +- update to 1.36.0 + * Fri Jul 13 2018 Remi Collet - 1.35.4-1 - update to 1.35.4 From 5cda233f1c3f877524a801a0489ecf2870c61b7d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 18 Dec 2018 10:46:29 +0100 Subject: [PATCH 24/68] v1.36.0 sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9f9c10d..fc2d456 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ clog /php-twig-1.35.2-9c24f2cd39dc1906b76879e099970b7e53724601.tar.gz /php-twig-1.35.3-b48680b6eb7d16b5025b9bfc4108d86f6b8af86f.tar.gz /php-twig-1.35.4-7e081e98378a1e78c29cc9eba4aefa5d78a05d2a.tar.gz +/php-twig-1.36.0-730c9c4471b5152d23061feb02b03382264c8a15.tar.gz diff --git a/sources b/sources index 2d15da8..507f009 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.35.4-7e081e98378a1e78c29cc9eba4aefa5d78a05d2a.tar.gz) = 776e8bfb322bf9e029a24f36f1b4f66867bec5fd4ba2e1ef9a0ce1119d9d01310aa123664b003833a1c9548fb076745c1a380441a402ba9cb4ea1f741282a587 +SHA512 (php-twig-1.36.0-730c9c4471b5152d23061feb02b03382264c8a15.tar.gz) = 547b3c7a94f23502ca4dceb03416a26cd89663721d5e9243f0669ba0d44e8cd38fafb29321152f34630bc00e38583ad1cc10d7c52fdf8b7ff88b0f431c540381 From 152dafd50e15bf8c857770dd8d6c035a079a44e0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Jan 2019 09:20:12 +0100 Subject: [PATCH 25/68] update to 1.37.1 bump dependency on PHP 5.4 --- .gitignore | 1 + php-twig.spec | 19 +++++++++---------- sources | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index fc2d456..9a6fd1d 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ clog /php-twig-1.35.3-b48680b6eb7d16b5025b9bfc4108d86f6b8af86f.tar.gz /php-twig-1.35.4-7e081e98378a1e78c29cc9eba4aefa5d78a05d2a.tar.gz /php-twig-1.36.0-730c9c4471b5152d23061feb02b03382264c8a15.tar.gz +/php-twig-1.37.0-66be9366c76cbf23e82e7171d47cbfa54a057a62.tar.gz diff --git a/php-twig.spec b/php-twig.spec index e28ebba..7ef14e2 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -1,7 +1,7 @@ # # Fedora spec file for php-twig # -# Copyright (c) 2014-2018 Shawn Iwinski +# Copyright (c) 2014-2019 Shawn Iwinski # Remi Collet # # License: MIT @@ -12,8 +12,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.36.0 -%global github_commit 730c9c4471b5152d23061feb02b03382264c8a15 +%global github_version 1.37.0 +%global github_commit 66be9366c76cbf23e82e7171d47cbfa54a057a62 %if 0%{?fedora} < 25 && 0%{?rhel} < 8 %global with_ext 1 @@ -35,8 +35,8 @@ BuildArch: noarch %global ini_name 40-%{ext_name}.ini %endif -# "php": ">=5.2.7" -%global php_min_ver 5.2.7 +# "php": ">=5.4.0" +%global php_min_ver 5.4 # Build using "--without tests" to disable tests %global with_tests 0%{!?_without_tests:1} @@ -125,11 +125,6 @@ Provides: php-pecl(pear.twig-project.org/CTwig)%{?_isa} = %{version} # This pkg was the only one in this channel so the channel is no longer needed Obsoletes: php-channel-twig -%if 0%{?fedora} < 20 && 0%{?rhel} < 7 -# Filter shared private -%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} -%{?filter_setup} -%endif %description %{summary}. @@ -300,6 +295,10 @@ exit $ret %changelog +* Mon Jan 14 2019 Remi Collet - 1.37.1-1 +- update to 1.37.1 +- bump dependency on PHP 5.4 + * Tue Dec 18 2018 Remi Collet - 1.36.0-1 - update to 1.36.0 diff --git a/sources b/sources index 507f009..e526183 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.36.0-730c9c4471b5152d23061feb02b03382264c8a15.tar.gz) = 547b3c7a94f23502ca4dceb03416a26cd89663721d5e9243f0669ba0d44e8cd38fafb29321152f34630bc00e38583ad1cc10d7c52fdf8b7ff88b0f431c540381 +SHA512 (php-twig-1.37.0-66be9366c76cbf23e82e7171d47cbfa54a057a62.tar.gz) = b66fef1929e17be00ce29cfed420170b37ccfb335956341e73116e63eb22d9938da794fa60007b2df6ad5e4962927e54b5d262d1eb3d2739240b50e0c2342c92 From a3ea78b5cccdeb6e481964e5d56bf8fab2d83924 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Jan 2019 09:28:57 +0100 Subject: [PATCH 26/68] fix version --- .gitignore | 1 + php-twig.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9a6fd1d..25530e0 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ clog /php-twig-1.35.4-7e081e98378a1e78c29cc9eba4aefa5d78a05d2a.tar.gz /php-twig-1.36.0-730c9c4471b5152d23061feb02b03382264c8a15.tar.gz /php-twig-1.37.0-66be9366c76cbf23e82e7171d47cbfa54a057a62.tar.gz +/php-twig-1.37.1-66be9366c76cbf23e82e7171d47cbfa54a057a62.tar.gz diff --git a/php-twig.spec b/php-twig.spec index 7ef14e2..2254633 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,7 +12,7 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.37.0 +%global github_version 1.37.1 %global github_commit 66be9366c76cbf23e82e7171d47cbfa54a057a62 %if 0%{?fedora} < 25 && 0%{?rhel} < 8 diff --git a/sources b/sources index e526183..b436976 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.37.0-66be9366c76cbf23e82e7171d47cbfa54a057a62.tar.gz) = b66fef1929e17be00ce29cfed420170b37ccfb335956341e73116e63eb22d9938da794fa60007b2df6ad5e4962927e54b5d262d1eb3d2739240b50e0c2342c92 +SHA512 (php-twig-1.37.1-66be9366c76cbf23e82e7171d47cbfa54a057a62.tar.gz) = b66fef1929e17be00ce29cfed420170b37ccfb335956341e73116e63eb22d9938da794fa60007b2df6ad5e4962927e54b5d262d1eb3d2739240b50e0c2342c92 From d4162b58f1e9cd6a4eb0af6171709e100ff8fd82 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:12 +0100 Subject: [PATCH 27/68] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- php-twig.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/php-twig.spec b/php-twig.spec index 2254633..9835fd8 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -49,7 +49,6 @@ Version: %{github_version} Release: 1%{?dist} Summary: The flexible, fast, and secure template engine for PHP -Group: Development/Libraries License: BSD URL: http://twig.sensiolabs.org Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz From 92fd481638df2249a1623986db88fc9a214c7d85 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 03:48:54 +0000 Subject: [PATCH 28/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 9835fd8..2d4c8bc 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -46,7 +46,7 @@ BuildArch: noarch 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 @@ -294,6 +294,9 @@ exit $ret %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 1.37.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Jan 14 2019 Remi Collet - 1.37.1-1 - update to 1.37.1 - bump dependency on PHP 5.4 From ea75fdecb39b1678d5f44886525713560859152f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 13 Mar 2019 10:00:12 +0100 Subject: [PATCH 29/68] v1.38.2 --- .gitignore | 1 + php-twig.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 25530e0..8d367ae 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ clog /php-twig-1.36.0-730c9c4471b5152d23061feb02b03382264c8a15.tar.gz /php-twig-1.37.0-66be9366c76cbf23e82e7171d47cbfa54a057a62.tar.gz /php-twig-1.37.1-66be9366c76cbf23e82e7171d47cbfa54a057a62.tar.gz +/php-twig-1.38.2-874adbd9222f928f6998732b25b01b41dff15b0c.tar.gz diff --git a/php-twig.spec b/php-twig.spec index 2d4c8bc..7445f11 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,8 +12,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.37.1 -%global github_commit 66be9366c76cbf23e82e7171d47cbfa54a057a62 +%global github_version 1.38.2 +%global github_commit 874adbd9222f928f6998732b25b01b41dff15b0c %if 0%{?fedora} < 25 && 0%{?rhel} < 8 %global with_ext 1 @@ -294,6 +294,9 @@ exit $ret %changelog +* Wed Mar 13 2019 Remi Collet - 1.38.2-1 +- update to 1.38.2 + * Sat Feb 02 2019 Fedora Release Engineering - 1.37.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index b436976..6956895 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.37.1-66be9366c76cbf23e82e7171d47cbfa54a057a62.tar.gz) = b66fef1929e17be00ce29cfed420170b37ccfb335956341e73116e63eb22d9938da794fa60007b2df6ad5e4962927e54b5d262d1eb3d2739240b50e0c2342c92 +SHA512 (php-twig-1.38.2-874adbd9222f928f6998732b25b01b41dff15b0c.tar.gz) = c1d02cb93452becd55aeb840d63ed956b3ea5e19ae481e794a7c48ab436754b34a5e8437bcc73343407b8546be3c67785367bfa6bebf74f97592e96dd96822ad From 64ce985c81d1679ceba66262f2cb08c42675e73b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 22 Mar 2019 08:56:01 +0100 Subject: [PATCH 30/68] v1.38.3 --- .gitignore | 1 + php-twig.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8d367ae..c7364d3 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ clog /php-twig-1.37.0-66be9366c76cbf23e82e7171d47cbfa54a057a62.tar.gz /php-twig-1.37.1-66be9366c76cbf23e82e7171d47cbfa54a057a62.tar.gz /php-twig-1.38.2-874adbd9222f928f6998732b25b01b41dff15b0c.tar.gz +/php-twig-1.38.3-5df0ef0ca2d08a6f087384c7f31530fb84889f28.tar.gz diff --git a/php-twig.spec b/php-twig.spec index 7445f11..3bf0fe3 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,8 +12,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.38.2 -%global github_commit 874adbd9222f928f6998732b25b01b41dff15b0c +%global github_version 1.38.3 +%global github_commit 5df0ef0ca2d08a6f087384c7f31530fb84889f28 %if 0%{?fedora} < 25 && 0%{?rhel} < 8 %global with_ext 1 @@ -294,6 +294,9 @@ exit $ret %changelog +* Fri Mar 22 2019 Remi Collet - 1.38.3-1 +- update to 1.38.3 + * Wed Mar 13 2019 Remi Collet - 1.38.2-1 - update to 1.38.2 diff --git a/sources b/sources index 6956895..7232eba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.38.2-874adbd9222f928f6998732b25b01b41dff15b0c.tar.gz) = c1d02cb93452becd55aeb840d63ed956b3ea5e19ae481e794a7c48ab436754b34a5e8437bcc73343407b8546be3c67785367bfa6bebf74f97592e96dd96822ad +SHA512 (php-twig-1.38.3-5df0ef0ca2d08a6f087384c7f31530fb84889f28.tar.gz) = 54e6a9049f15821e162f1924c73a739580b1c1e5fa86a6867c0bb5fa2710c0c60a72112b497994e5a85dde36049c3ce3fdc1d3c5f6c4219eedfeef7d3d4d0474 From 473c552b344c59bceb19bfc91a7b2812e055aa3a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 25 Mar 2019 11:39:46 +0100 Subject: [PATCH 31/68] v1.38.4 --- .gitignore | 1 + php-twig.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c7364d3..8073795 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ clog /php-twig-1.37.1-66be9366c76cbf23e82e7171d47cbfa54a057a62.tar.gz /php-twig-1.38.2-874adbd9222f928f6998732b25b01b41dff15b0c.tar.gz /php-twig-1.38.3-5df0ef0ca2d08a6f087384c7f31530fb84889f28.tar.gz +/php-twig-1.38.4-7732e9e7017d751313811bd118de61302e9c8b35.tar.gz diff --git a/php-twig.spec b/php-twig.spec index 3bf0fe3..741e283 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,8 +12,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.38.3 -%global github_commit 5df0ef0ca2d08a6f087384c7f31530fb84889f28 +%global github_version 1.38.4 +%global github_commit 7732e9e7017d751313811bd118de61302e9c8b35 %if 0%{?fedora} < 25 && 0%{?rhel} < 8 %global with_ext 1 @@ -294,6 +294,9 @@ exit $ret %changelog +* Mon Mar 25 2019 Remi Collet - 1.38.4-1 +- update to 1.38.4 + * Fri Mar 22 2019 Remi Collet - 1.38.3-1 - update to 1.38.3 diff --git a/sources b/sources index 7232eba..cf0c6a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.38.3-5df0ef0ca2d08a6f087384c7f31530fb84889f28.tar.gz) = 54e6a9049f15821e162f1924c73a739580b1c1e5fa86a6867c0bb5fa2710c0c60a72112b497994e5a85dde36049c3ce3fdc1d3c5f6c4219eedfeef7d3d4d0474 +SHA512 (php-twig-1.38.4-7732e9e7017d751313811bd118de61302e9c8b35.tar.gz) = 02c7c064b46729b6a4bf04a421848217605373c338de3f6099ac7673688c9e6658b6bbcd19f682a1181ecba8223730d252299c9fd8f8b6ee0c6879bdb3f1c507 From c4086ddb09901405e654bcc2052d93eb549b3950 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 17 Apr 2019 10:51:40 +0200 Subject: [PATCH 32/68] v1.39.1 --- .gitignore | 1 + php-twig.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 8073795..39e3709 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ clog /php-twig-1.38.2-874adbd9222f928f6998732b25b01b41dff15b0c.tar.gz /php-twig-1.38.3-5df0ef0ca2d08a6f087384c7f31530fb84889f28.tar.gz /php-twig-1.38.4-7732e9e7017d751313811bd118de61302e9c8b35.tar.gz +/php-twig-1.39.1-23e7b6f0cfa1d7ba3de69f30d8e05cf957412fec.tar.gz diff --git a/php-twig.spec b/php-twig.spec index 741e283..09b217a 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,8 +12,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.38.4 -%global github_commit 7732e9e7017d751313811bd118de61302e9c8b35 +%global github_version 1.39.1 +%global github_commit 23e7b6f0cfa1d7ba3de69f30d8e05cf957412fec %if 0%{?fedora} < 25 && 0%{?rhel} < 8 %global with_ext 1 @@ -46,7 +46,7 @@ BuildArch: noarch 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 @@ -256,7 +256,7 @@ sed 's/function testGetAttributeWithTemplateAsObject/function SKIP_testGetAttrib : Test suite without extension ret=0 -for cmd in php php56 php70 php71 php72 php73; do +for cmd in php php71 php72 php73; do if which $cmd; then $cmd %{_bindir}/phpunit --verbose || ret=1 fi @@ -294,6 +294,9 @@ exit $ret %changelog +* Wed Apr 17 2019 Remi Collet - 1.39.1-1 +- update to 1.39.1 + * Mon Mar 25 2019 Remi Collet - 1.38.4-1 - update to 1.38.4 diff --git a/sources b/sources index cf0c6a9..340ace7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.38.4-7732e9e7017d751313811bd118de61302e9c8b35.tar.gz) = 02c7c064b46729b6a4bf04a421848217605373c338de3f6099ac7673688c9e6658b6bbcd19f682a1181ecba8223730d252299c9fd8f8b6ee0c6879bdb3f1c507 +SHA512 (php-twig-1.39.1-23e7b6f0cfa1d7ba3de69f30d8e05cf957412fec.tar.gz) = 2aa8ef87fcafed03917ce087bcd965d81a620a6273b5ea1a71755ae4ef8d12db52e99f29301ac997b7e4d2afe9a79a687f56c481da1d29a89c65994c23958dbf From 0d89fc51d9d5784674d98d2f6528f477899426ef Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 29 Apr 2019 11:10:20 +0200 Subject: [PATCH 33/68] v1.40.0 --- .gitignore | 1 + php-twig.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 39e3709..6ab58b7 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ clog /php-twig-1.38.3-5df0ef0ca2d08a6f087384c7f31530fb84889f28.tar.gz /php-twig-1.38.4-7732e9e7017d751313811bd118de61302e9c8b35.tar.gz /php-twig-1.39.1-23e7b6f0cfa1d7ba3de69f30d8e05cf957412fec.tar.gz +/php-twig-1.40.0-2ba4eaf6b0649760a2cdbc0ada19486f9c1b4125.tar.gz diff --git a/php-twig.spec b/php-twig.spec index 09b217a..0f85553 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,8 +12,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.39.1 -%global github_commit 23e7b6f0cfa1d7ba3de69f30d8e05cf957412fec +%global github_version 1.40.0 +%global github_commit 2ba4eaf6b0649760a2cdbc0ada19486f9c1b4125 %if 0%{?fedora} < 25 && 0%{?rhel} < 8 %global with_ext 1 @@ -294,6 +294,9 @@ exit $ret %changelog +* Mon Apr 29 2019 Remi Collet - 1.40.0-1 +- update to 1.40.0 + * Wed Apr 17 2019 Remi Collet - 1.39.1-1 - update to 1.39.1 diff --git a/sources b/sources index 340ace7..efea470 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.39.1-23e7b6f0cfa1d7ba3de69f30d8e05cf957412fec.tar.gz) = 2aa8ef87fcafed03917ce087bcd965d81a620a6273b5ea1a71755ae4ef8d12db52e99f29301ac997b7e4d2afe9a79a687f56c481da1d29a89c65994c23958dbf +SHA512 (php-twig-1.40.0-2ba4eaf6b0649760a2cdbc0ada19486f9c1b4125.tar.gz) = debbc0f5a088e4699108414411631a44ca586efdfce694c7ac9e3edf10ce832a5cb84eea698547395804b476b6475e1dcaadd7e60df1072fbe66ec15f209770a From 1bae613a1db90cf808b1c8af78932168e5818b84 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 30 Apr 2019 09:01:57 +0200 Subject: [PATCH 34/68] v1.40.1 --- .gitignore | 1 + php-twig.spec | 7 +++++-- sources | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6ab58b7..98d0447 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ clog /php-twig-1.38.4-7732e9e7017d751313811bd118de61302e9c8b35.tar.gz /php-twig-1.39.1-23e7b6f0cfa1d7ba3de69f30d8e05cf957412fec.tar.gz /php-twig-1.40.0-2ba4eaf6b0649760a2cdbc0ada19486f9c1b4125.tar.gz +/php-twig-1.40.1-35889516bbd6bbe46a600c2c33b03515df4a076e.tar.gz diff --git a/php-twig.spec b/php-twig.spec index 0f85553..533fc1d 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,8 +12,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.40.0 -%global github_commit 2ba4eaf6b0649760a2cdbc0ada19486f9c1b4125 +%global github_version 1.40.1 +%global github_commit 35889516bbd6bbe46a600c2c33b03515df4a076e %if 0%{?fedora} < 25 && 0%{?rhel} < 8 %global with_ext 1 @@ -294,6 +294,9 @@ exit $ret %changelog +* Tue Apr 30 2019 Remi Collet - 1.40.1-1 +- update to 1.40.1 + * Mon Apr 29 2019 Remi Collet - 1.40.0-1 - update to 1.40.0 diff --git a/sources b/sources index efea470..2f01912 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (php-twig-1.40.0-2ba4eaf6b0649760a2cdbc0ada19486f9c1b4125.tar.gz) = debbc0f5a088e4699108414411631a44ca586efdfce694c7ac9e3edf10ce832a5cb84eea698547395804b476b6475e1dcaadd7e60df1072fbe66ec15f209770a +SHA512 (php-twig-1.40.1-35889516bbd6bbe46a600c2c33b03515df4a076e.tar.gz) = 3f338bf42a009d17a4abf894d5a615e4e7ba400c2e79def4dcf1c67bf08d20389082076ec425c7243c1d0c5f47d7e295849da9e340fb2ec17489a2829c75564c From e0b48a362e2eb5449a3896456131bc574e8fb593 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 16 May 2019 09:02:58 +0200 Subject: [PATCH 35/68] v1.41.0 --- .gitignore | 1 + php-twig.spec | 7 +++++-- sources | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 98d0447..b29815e 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ clog /php-twig-1.39.1-23e7b6f0cfa1d7ba3de69f30d8e05cf957412fec.tar.gz /php-twig-1.40.0-2ba4eaf6b0649760a2cdbc0ada19486f9c1b4125.tar.gz /php-twig-1.40.1-35889516bbd6bbe46a600c2c33b03515df4a076e.tar.gz +/php-twig-1.41.0-575cd5028362da591facde1ef5d7b94553c375c9.tar.gz diff --git a/php-twig.spec b/php-twig.spec index 533fc1d..9ad1e1d 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,8 +12,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.40.1 -%global github_commit 35889516bbd6bbe46a600c2c33b03515df4a076e +%global github_version 1.41.0 +%global github_commit 575cd5028362da591facde1ef5d7b94553c375c9 %if 0%{?fedora} < 25 && 0%{?rhel} < 8 %global with_ext 1 @@ -294,6 +294,9 @@ exit $ret %changelog +* Wed May 15 2019 Remi Collet - 1.41.0-1 +- update to 1.41.0 + * Tue Apr 30 2019 Remi Collet - 1.40.1-1 - update to 1.40.1 diff --git a/sources b/sources index 2f01912..59e359c 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (php-twig-1.40.0-2ba4eaf6b0649760a2cdbc0ada19486f9c1b4125.tar.gz) = debbc0f5a088e4699108414411631a44ca586efdfce694c7ac9e3edf10ce832a5cb84eea698547395804b476b6475e1dcaadd7e60df1072fbe66ec15f209770a -SHA512 (php-twig-1.40.1-35889516bbd6bbe46a600c2c33b03515df4a076e.tar.gz) = 3f338bf42a009d17a4abf894d5a615e4e7ba400c2e79def4dcf1c67bf08d20389082076ec425c7243c1d0c5f47d7e295849da9e340fb2ec17489a2829c75564c +SHA512 (php-twig-1.41.0-575cd5028362da591facde1ef5d7b94553c375c9.tar.gz) = c45cead1c45317bc63e8e6493912e4de17d3e5cd98b9f219b680e29ea8b4db96489a09c41eff972cf8f9a2a8cd4e836ffc72aa4f0766fb2161b34280431a9406 From aaed4cd294670e5b3949f8cb4525dd7231384960 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 3 Jun 2019 14:44:34 +0200 Subject: [PATCH 36/68] v1.42.0 --- .gitignore | 1 + php-twig.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index b29815e..651a180 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ clog /php-twig-1.40.0-2ba4eaf6b0649760a2cdbc0ada19486f9c1b4125.tar.gz /php-twig-1.40.1-35889516bbd6bbe46a600c2c33b03515df4a076e.tar.gz /php-twig-1.41.0-575cd5028362da591facde1ef5d7b94553c375c9.tar.gz +/php-twig-1.42.0-2983fcf2e20a4afe95f07e61d89a7590b3c8df2e.tar.gz diff --git a/php-twig.spec b/php-twig.spec index 9ad1e1d..05a8ed2 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,8 +12,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.41.0 -%global github_commit 575cd5028362da591facde1ef5d7b94553c375c9 +%global github_version 1.42.0 +%global github_commit 2983fcf2e20a4afe95f07e61d89a7590b3c8df2e %if 0%{?fedora} < 25 && 0%{?rhel} < 8 %global with_ext 1 @@ -256,7 +256,7 @@ sed 's/function testGetAttributeWithTemplateAsObject/function SKIP_testGetAttrib : Test suite without extension ret=0 -for cmd in php php71 php72 php73; do +for cmd in php php71 php72 php73 php74; do if which $cmd; then $cmd %{_bindir}/phpunit --verbose || ret=1 fi @@ -294,6 +294,9 @@ exit $ret %changelog +* Mon Jun 3 2019 Remi Collet - 1.42.0-1 +- update to 1.42.0 + * Wed May 15 2019 Remi Collet - 1.41.0-1 - update to 1.41.0 diff --git a/sources b/sources index 59e359c..6d75efc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.41.0-575cd5028362da591facde1ef5d7b94553c375c9.tar.gz) = c45cead1c45317bc63e8e6493912e4de17d3e5cd98b9f219b680e29ea8b4db96489a09c41eff972cf8f9a2a8cd4e836ffc72aa4f0766fb2161b34280431a9406 +SHA512 (php-twig-1.42.0-2983fcf2e20a4afe95f07e61d89a7590b3c8df2e.tar.gz) = c74142f56c62767561a090a92acd7b7cbdda75da6cb332f6a66530ef0cae465ac36a8cb57b0b7e8f18ac91e0a61a9b4de51a196fd2302d9839315a6dc2af41a6 From be471fd6017b5f2068c9bfeaa1c1781e609f52fc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 4 Jun 2019 15:32:12 +0200 Subject: [PATCH 37/68] v1.42.1 --- .gitignore | 1 + php-twig.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 651a180..c8e344a 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ clog /php-twig-1.40.1-35889516bbd6bbe46a600c2c33b03515df4a076e.tar.gz /php-twig-1.41.0-575cd5028362da591facde1ef5d7b94553c375c9.tar.gz /php-twig-1.42.0-2983fcf2e20a4afe95f07e61d89a7590b3c8df2e.tar.gz +/php-twig-1.42.1-671347603760a88b1e7288aaa9378f33687d7edf.tar.gz diff --git a/php-twig.spec b/php-twig.spec index 05a8ed2..ce09f88 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,8 +12,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.42.0 -%global github_commit 2983fcf2e20a4afe95f07e61d89a7590b3c8df2e +%global github_version 1.42.1 +%global github_commit 671347603760a88b1e7288aaa9378f33687d7edf %if 0%{?fedora} < 25 && 0%{?rhel} < 8 %global with_ext 1 @@ -294,6 +294,9 @@ exit $ret %changelog +* Tue Jun 4 2019 Remi Collet - 1.42.1-1 +- update to 1.42.1 + * Mon Jun 3 2019 Remi Collet - 1.42.0-1 - update to 1.42.0 diff --git a/sources b/sources index 6d75efc..dfe2f88 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.42.0-2983fcf2e20a4afe95f07e61d89a7590b3c8df2e.tar.gz) = c74142f56c62767561a090a92acd7b7cbdda75da6cb332f6a66530ef0cae465ac36a8cb57b0b7e8f18ac91e0a61a9b4de51a196fd2302d9839315a6dc2af41a6 +SHA512 (php-twig-1.42.1-671347603760a88b1e7288aaa9378f33687d7edf.tar.gz) = 8699865d642ef6f44ec87ee3d1427a27cb880d8767864c0b4277c6587408f870179f9d4cfe97670b7da5943d5fb533dd59e3c7478796c7415af30e45ea5276b5 From 1bd52f5a391d3789b2c1cfc83866c3dbf17d4b24 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 4 Jun 2019 15:32:12 +0200 Subject: [PATCH 38/68] v1.42.1 (cherry picked from commit be471fd6017b5f2068c9bfeaa1c1781e609f52fc) --- .gitignore | 1 + php-twig.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 651a180..c8e344a 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ clog /php-twig-1.40.1-35889516bbd6bbe46a600c2c33b03515df4a076e.tar.gz /php-twig-1.41.0-575cd5028362da591facde1ef5d7b94553c375c9.tar.gz /php-twig-1.42.0-2983fcf2e20a4afe95f07e61d89a7590b3c8df2e.tar.gz +/php-twig-1.42.1-671347603760a88b1e7288aaa9378f33687d7edf.tar.gz diff --git a/php-twig.spec b/php-twig.spec index 05a8ed2..ce09f88 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,8 +12,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.42.0 -%global github_commit 2983fcf2e20a4afe95f07e61d89a7590b3c8df2e +%global github_version 1.42.1 +%global github_commit 671347603760a88b1e7288aaa9378f33687d7edf %if 0%{?fedora} < 25 && 0%{?rhel} < 8 %global with_ext 1 @@ -294,6 +294,9 @@ exit $ret %changelog +* Tue Jun 4 2019 Remi Collet - 1.42.1-1 +- update to 1.42.1 + * Mon Jun 3 2019 Remi Collet - 1.42.0-1 - update to 1.42.0 diff --git a/sources b/sources index 6d75efc..dfe2f88 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.42.0-2983fcf2e20a4afe95f07e61d89a7590b3c8df2e.tar.gz) = c74142f56c62767561a090a92acd7b7cbdda75da6cb332f6a66530ef0cae465ac36a8cb57b0b7e8f18ac91e0a61a9b4de51a196fd2302d9839315a6dc2af41a6 +SHA512 (php-twig-1.42.1-671347603760a88b1e7288aaa9378f33687d7edf.tar.gz) = 8699865d642ef6f44ec87ee3d1427a27cb880d8767864c0b4277c6587408f870179f9d4cfe97670b7da5943d5fb533dd59e3c7478796c7415af30e45ea5276b5 From 824df36a18d86ca97c89b77312d7f5ff1a896988 Mon Sep 17 00:00:00 2001 From: Shawn Iwinski Date: Sun, 16 Jun 2019 17:38:25 -0400 Subject: [PATCH 39/68] Add composer.json --- composer.json | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 composer.json diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..2f10465 --- /dev/null +++ b/composer.json @@ -0,0 +1,48 @@ +{ + "name": "twig/twig", + "type": "library", + "description": "Twig, the flexible, fast, and secure template language for PHP", + "keywords": ["templating"], + "homepage": "https://twig.symfony.com", + "license": "BSD-3-Clause", + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" + }, + { + "name": "Twig Team", + "homepage": "https://twig.symfony.com/contributors", + "role": "Contributors" + }, + { + "name": "Armin Ronacher", + "email": "armin.ronacher@active-4.com", + "role": "Project Founder" + } + ], + "require": { + "php": ">=5.4.0", + "symfony/polyfill-ctype": "^1.8" + }, + "require-dev": { + "symfony/phpunit-bridge": "^3.4.19|^4.1.8|^5.0", + "symfony/debug": "^2.7", + "psr/container": "^1.0" + }, + "autoload": { + "psr-0" : { + "Twig_" : "lib/" + }, + "psr-4" : { + "Twig\\" : "src/" + } + }, + "extra": { + "branch-alias": { + "dev-master": "1.42-dev" + } + } +} From a0ea03a76d034cb54f0da7e8dac9734e20996880 Mon Sep 17 00:00:00 2001 From: Shawn Iwinski Date: Tue, 18 Jun 2019 18:51:54 -0400 Subject: [PATCH 40/68] Update to 1.42.2 --- .gitignore | 1 + php-twig.spec | 13 +++++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index c8e344a..2d464b1 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ clog /php-twig-1.41.0-575cd5028362da591facde1ef5d7b94553c375c9.tar.gz /php-twig-1.42.0-2983fcf2e20a4afe95f07e61d89a7590b3c8df2e.tar.gz /php-twig-1.42.1-671347603760a88b1e7288aaa9378f33687d7edf.tar.gz +/php-twig-1.42.2-21707d6ebd05476854805e4f91b836531941bcd4.tar.gz diff --git a/php-twig.spec b/php-twig.spec index ce09f88..828240c 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,8 +12,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.42.1 -%global github_commit 671347603760a88b1e7288aaa9378f33687d7edf +%global github_version 1.42.2 +%global github_commit 21707d6ebd05476854805e4f91b836531941bcd4 %if 0%{?fedora} < 25 && 0%{?rhel} < 8 %global with_ext 1 @@ -65,7 +65,7 @@ BuildRequires: php-symfony-debug >= 2.7 BuildRequires: php-composer(psr/container) < 2 BuildRequires: php-composer(psr/container) >= 1.0 %endif -## phpcompatinfo (computed from version 1.34.2) +## phpcompatinfo (computed from version 1.42.2) BuildRequires: php-ctype BuildRequires: php-date BuildRequires: php-dom @@ -75,6 +75,7 @@ BuildRequires: php-json BuildRequires: php-mbstring BuildRequires: php-pcre BuildRequires: php-reflection +BuildRequires: php-simplexml BuildRequires: php-spl %endif # Autoloader @@ -83,7 +84,7 @@ BuildRequires: php-fedora-autoloader-devel # Lib ## composer.json Requires: php(language) >= %{php_min_ver} -## phpcompatinfo (computed from version 1.34.2) +## phpcompatinfo (computed from version 1.42.2) Requires: php-ctype Requires: php-date Requires: php-dom @@ -93,6 +94,7 @@ Requires: php-json Requires: php-mbstring Requires: php-pcre Requires: php-reflection +Requires: php-simplexml Requires: php-spl # Ext %if %{with_ext} @@ -294,6 +296,9 @@ exit $ret %changelog +* Tue Jun 18 2019 Shawn Iwinski - 1.42.2-1 +- Update to 1.42.2 + * Tue Jun 4 2019 Remi Collet - 1.42.1-1 - update to 1.42.1 diff --git a/sources b/sources index dfe2f88..a4f8399 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.42.1-671347603760a88b1e7288aaa9378f33687d7edf.tar.gz) = 8699865d642ef6f44ec87ee3d1427a27cb880d8767864c0b4277c6587408f870179f9d4cfe97670b7da5943d5fb533dd59e3c7478796c7415af30e45ea5276b5 +SHA512 (php-twig-1.42.2-21707d6ebd05476854805e4f91b836531941bcd4.tar.gz) = ec5fd526d2c6a9d740748416e567a77c50ccf07259e8b7a0c4a6f035ccfa23f54cb29291695b2260ad51250101a00592f69f387c294558fd664fc97dd3bef362 From e904576e539b002419083893e191e5ccc0d15968 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 10:17:50 +0000 Subject: [PATCH 41/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 828240c..19bb0a9 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -46,7 +46,7 @@ BuildArch: noarch 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 @@ -296,6 +296,9 @@ exit $ret %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 1.42.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Jun 18 2019 Shawn Iwinski - 1.42.2-1 - Update to 1.42.2 From 4073edf9f9893281830907c80225efa5886a3ec8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 27 Aug 2019 13:35:32 +0200 Subject: [PATCH 42/68] update to 1.42.3 use symfony/debug v3 use phpunit v7 raise dependency on PHP 5.5 drop support of the C extension --- .gitignore | 1 + composer.json | 11 +++- php-twig.spec | 152 ++++++++------------------------------------------ sources | 2 +- 4 files changed, 33 insertions(+), 133 deletions(-) diff --git a/.gitignore b/.gitignore index 2d464b1..c7420a3 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ clog /php-twig-1.42.0-2983fcf2e20a4afe95f07e61d89a7590b3c8df2e.tar.gz /php-twig-1.42.1-671347603760a88b1e7288aaa9378f33687d7edf.tar.gz /php-twig-1.42.2-21707d6ebd05476854805e4f91b836531941bcd4.tar.gz +/php-twig-1.42.3-201baee843e0ffe8b0b956f336dd42b2a92fae4e.tar.gz diff --git a/composer.json b/composer.json index 2f10465..9807aa7 100644 --- a/composer.json +++ b/composer.json @@ -24,12 +24,12 @@ } ], "require": { - "php": ">=5.4.0", + "php": ">=5.5.0", "symfony/polyfill-ctype": "^1.8" }, "require-dev": { - "symfony/phpunit-bridge": "^3.4.19|^4.1.8|^5.0", - "symfony/debug": "^2.7", + "symfony/phpunit-bridge": "^4.4@dev|^5.0", + "symfony/debug": "^3.4|^4.2", "psr/container": "^1.0" }, "autoload": { @@ -40,6 +40,11 @@ "Twig\\" : "src/" } }, + "autoload-dev": { + "psr-4" : { + "Twig\\Tests\\" : "tests" + } + }, "extra": { "branch-alias": { "dev-master": "1.42-dev" diff --git a/php-twig.spec b/php-twig.spec index 19bb0a9..81d53df 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,31 +12,15 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.42.2 -%global github_commit 21707d6ebd05476854805e4f91b836531941bcd4 - -%if 0%{?fedora} < 25 && 0%{?rhel} < 8 -%global with_ext 1 -%else -%global with_ext 0 -BuildArch: noarch -%endif +%global github_version 1.42.3 +%global github_commit 201baee843e0ffe8b0b956f336dd42b2a92fae4e # Lib %global composer_vendor twig %global composer_project twig -# Ext -%global ext_name twig -%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} -%if "%{php_version}" < "5.6" -%global ini_name %{ext_name}.ini -%else -%global ini_name 40-%{ext_name}.ini -%endif - -# "php": ">=5.4.0" -%global php_min_ver 5.4 +# "php": ">=5.5.0" +%global php_min_ver 5.5 # Build using "--without tests" to disable tests %global with_tests 0%{!?_without_tests:1} @@ -46,22 +30,23 @@ BuildArch: noarch 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 URL: http://twig.sensiolabs.org Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz +BuildArch: noarch BuildRequires: php-devel >= %{php_min_ver} # Tests %if %{with_tests} -BuildRequires: php-composer(phpunit/phpunit) +BuildRequires: phpunit7 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(symfony/debug) >= 2.7 with php-composer(symfony/debug) < 3) +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-symfony-debug >= 2.7 +BuildRequires: php-symfony3-debug >= 3.4 BuildRequires: php-composer(psr/container) < 2 BuildRequires: php-composer(psr/container) >= 1.0 %endif @@ -96,11 +81,6 @@ Requires: php-pcre Requires: php-reflection Requires: php-simplexml Requires: php-spl -# Ext -%if %{with_ext} -Requires: php(zend-abi) = %{php_zend_api} -Requires: php(api) = %{php_core_api} -%endif # Autoloader Requires: php-composer(fedora/autoloader) @@ -112,16 +92,6 @@ Obsoletes: php-twig-Twig < %{version}-%{release} Provides: php-twig-Twig = %{version}-%{release} ## PEAR Provides: php-pear(pear.twig-project.org/Twig) = %{version} -# Ext -%if %{with_ext} -## Rename -Obsoletes: php-twig-ctwig < %{version}-%{release} -Provides: php-twig-ctwig = %{version}-%{release} -Provides: php-twig-ctwig%{?_isa} = %{version}-%{release} -## PECL -Provides: php-pecl(pear.twig-project.org/CTwig) = %{version} -Provides: php-pecl(pear.twig-project.org/CTwig)%{?_isa} = %{version} -%endif # This pkg was the only one in this channel so the channel is no longer needed Obsoletes: php-channel-twig @@ -147,21 +117,6 @@ Autoloader: %{phpdir}/Twig/autoload.php %prep %setup -qn %{github_name}-%{github_commit} -%if %{with_ext} -: Ext -- NTS -mv ext/%{ext_name} ext/NTS -%if %{with_zts} -: Ext -- ZTS -cp -pr ext/NTS ext/ZTS -%endif - -: Ext -- Create configuration file -cat > %{ini_name} << 'INI' -; Enable %{ext_name} extension module -extension=%{ext_name}.so -INI -%endif - : Move the PSR-4 compat library mv src lib/Twig/psr4 @@ -170,23 +125,7 @@ phpab --template fedora --output lib/Twig/autoload.php lib %build -%if %{with_ext} -: Ext -- NTS -pushd ext/NTS -%{_bindir}/phpize -%configure --with-php-config=%{_bindir}/php-config -make %{?_smp_mflags} -popd - -: Ext -- ZTS -%if %{with_zts} -pushd ext/ZTS -%{_bindir}/zts-phpize -%configure --with-php-config=%{_bindir}/zts-php-config -make %{?_smp_mflags} -popd -%endif -%endif +: nothing %install @@ -194,17 +133,6 @@ popd mkdir -p %{buildroot}%{phpdir} cp -rp lib/* %{buildroot}%{phpdir}/ -%if %{with_ext} -: Ext -- NTS -make -C ext/NTS install INSTALL_ROOT=%{buildroot} -install -D -m 0644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} -: Ext -- ZTS -%if %{with_zts} -make -C ext/ZTS install INSTALL_ROOT=%{buildroot} -install -D -m 0644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} -%endif -%endif - %check : Library version check @@ -214,62 +142,32 @@ install -D -m 0644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} %{_bindir}/php -r 'require_once "%{buildroot}%{phpdir}/Twig/autoload.php"; exit(version_compare("%{version}", Twig\Environment::VERSION, "=") ? 0 : 1);' -%if %{with_ext} -: Extension version check -EXT_VERSION=`grep PHP_TWIG_VERSION ext/NTS/php_twig.h | awk '{print $3}' | sed 's/"//g'` \ - %{_bindir}/php -r 'exit(version_compare("%{version}", getenv("EXT_VERSION"), "=") ? 0 : 1);' - -: Extension NTS minimal load test -%{_bindir}/php --no-php-ini \ - --define extension=ext/NTS/modules/%{ext_name}.so \ - --modules | grep %{ext_name} - -%if %{with_zts} -: Extension ZTS minimal load test -%{__ztsphp} --no-php-ini \ - --define extension=ext/ZTS/modules/%{ext_name}.so \ - --modules | grep %{ext_name} -%endif -%endif - %if %{with_tests} : Generate autoloader mkdir vendor cat << 'EOF' | tee vendor/autoload.php phpunit.xml -: Skip tests known to fail -sed -e 's#function testGetAttributeExceptions#function SKIP_testGetAttributeExceptions#' \ - -e 's/function testGetAttributeWithTemplateAsObject/function skip_testGetAttributeWithTemplateAsObject/' \ - -i test/Twig/Tests/TemplateTest.php -%ifarch ppc64 -sed 's/function testGetAttributeWithTemplateAsObject/function SKIP_testGetAttributeWithTemplateAsObject/' \ - -i test/Twig/Tests/TemplateTest.php -%endif - : Test suite without extension ret=0 for cmd in php php71 php72 php73 php74; do if which $cmd; then - $cmd %{_bindir}/phpunit --verbose || ret=1 + $cmd %{_bindir}/phpunit7 \ + --filter '^((?!(testGetAttributeExceptions|testGetAttributeWithTemplateAsObject)).)*$' \ + --verbose || ret=1 fi done -%if %{with_ext} -: Test suite with extension -%{_bindir}/php --define extension=ext/NTS/modules/%{ext_name}.so \ - %{_bindir}/phpunit --verbose || ret=1 -%endif - exit $ret %else : Tests skipped @@ -282,20 +180,16 @@ exit $ret %doc CHANGELOG README.rst composer.json # Lib %{phpdir}/Twig -%if %{with_ext} -# Ext -## NTS -%config(noreplace) %{php_inidir}/%{ini_name} -%{php_extdir}/%{ext_name}.so -## ZTS -%if %{with_zts} -%config(noreplace) %{php_ztsinidir}/%{ini_name} -%{php_ztsextdir}/%{ext_name}.so -%endif -%endif %changelog +* Tue Aug 27 2019 Remi Collet - 1.42.3-1 +- update to 1.42.3 +- use symfony/debug v3 +- use phpunit v7 +- raise dependency on PHP 5.5 +- drop support of the C extension + * Fri Jul 26 2019 Fedora Release Engineering - 1.42.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index a4f8399..9989652 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.42.2-21707d6ebd05476854805e4f91b836531941bcd4.tar.gz) = ec5fd526d2c6a9d740748416e567a77c50ccf07259e8b7a0c4a6f035ccfa23f54cb29291695b2260ad51250101a00592f69f387c294558fd664fc97dd3bef362 +SHA512 (php-twig-1.42.3-201baee843e0ffe8b0b956f336dd42b2a92fae4e.tar.gz) = 617b303b4c8a10347125553c7ab48d5522a751d41e7eec51d125379a731f14bf2b912cecf4367201fe029352f25acf66bc29f084d9217fd8809b4f7e5f21e89a From 3d42dbd77dbc365b7060ab4b82d13871f5ebcbbc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 12 Nov 2019 12:05:47 +0100 Subject: [PATCH 43/68] update to 1.42.4 sources from git snapshot --- .gitignore | 1 + makesrc.sh | 28 ++++++++++++++++++++++++++++ php-twig.spec | 12 +++++++++--- sources | 2 +- 4 files changed, 39 insertions(+), 4 deletions(-) create mode 100755 makesrc.sh diff --git a/.gitignore b/.gitignore index c7420a3..51682d8 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ clog /php-twig-1.42.1-671347603760a88b1e7288aaa9378f33687d7edf.tar.gz /php-twig-1.42.2-21707d6ebd05476854805e4f91b836531941bcd4.tar.gz /php-twig-1.42.3-201baee843e0ffe8b0b956f336dd42b2a92fae4e.tar.gz +/php-twig-1.42.4-e587180.tgz diff --git a/makesrc.sh b/makesrc.sh new file mode 100755 index 0000000..97be9f6 --- /dev/null +++ b/makesrc.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +NAME=$(basename $PWD) +OWNER=$(sed -n '/^%global github_owner/{s/.* //;p}' $NAME.spec) +PROJECT=$(sed -n '/^%global github_name/{s/.* //;p}' $NAME.spec) +VERSION=$(sed -n '/^%global github_version/{s/.* //;p}' $NAME.spec) +COMMIT=$(sed -n '/^%global github_commit/{s/.* //;p}' $NAME.spec) +SHORT=${COMMIT:0:7} + +echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n" + +echo "Cloning..." +rm -rf $PROJECT-$COMMIT +git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT + +echo "Getting commit..." +pushd $PROJECT-$COMMIT +git checkout $COMMIT +cp composer.json ../composer.json +popd + +echo "Archiving..." +tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs $PROJECT-$COMMIT + +echo "Cleaning..." +rm -rf $PROJECT-$COMMIT + +echo "Done." diff --git a/php-twig.spec b/php-twig.spec index 81d53df..af4abfe 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,8 +12,9 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.42.3 -%global github_commit 201baee843e0ffe8b0b956f336dd42b2a92fae4e +%global github_version 1.42.4 +%global github_commit e587180584c3d2d6cb864a0454e777bb6dcb6152 +%global github_short %(c=%{github_commit}; echo ${c:0:7}) # Lib %global composer_vendor twig @@ -35,7 +36,8 @@ Summary: The flexible, fast, and secure template engine for PHP License: BSD URL: http://twig.sensiolabs.org -Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz +Source0: %{name}-%{github_version}-%{github_short}.tgz +Source1: makesrc.sh BuildArch: noarch BuildRequires: php-devel >= %{php_min_ver} @@ -183,6 +185,10 @@ exit $ret %changelog +* Tue Nov 12 2019 Remi Collet - 1.42.4-1 +- update to 1.42.4 +- sources from git snapshot + * Tue Aug 27 2019 Remi Collet - 1.42.3-1 - update to 1.42.3 - use symfony/debug v3 diff --git a/sources b/sources index 9989652..b4c2fff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.42.3-201baee843e0ffe8b0b956f336dd42b2a92fae4e.tar.gz) = 617b303b4c8a10347125553c7ab48d5522a751d41e7eec51d125379a731f14bf2b912cecf4367201fe029352f25acf66bc29f084d9217fd8809b4f7e5f21e89a +SHA512 (php-twig-1.42.4-e587180.tgz) = 884d98074d11e70fb5328d8b786b74dc756ca60474951e18384734c93926b2f148feaca9518e32217c014fa79ce43cf4b3137772a26318fad76530a56bd49889 From 27c9b43d85e8e69b61f491b205d3bfb8c132d999 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 08:52:15 +0000 Subject: [PATCH 44/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_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 af4abfe..2f7c706 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 +* Thu Jan 30 2020 Fedora Release Engineering - 1.42.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Nov 12 2019 Remi Collet - 1.42.4-1 - update to 1.42.4 - sources from git snapshot From 005814e9b3dcd009815ff0cccbff0f47e303f7e9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 12 Feb 2020 10:29:38 +0100 Subject: [PATCH 45/68] v1.42.5 --- .gitignore | 1 + php-twig.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 51682d8..48f6ce9 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ clog /php-twig-1.42.2-21707d6ebd05476854805e4f91b836531941bcd4.tar.gz /php-twig-1.42.3-201baee843e0ffe8b0b956f336dd42b2a92fae4e.tar.gz /php-twig-1.42.4-e587180.tgz +/php-twig-1.42.5-87b2ea9.tgz diff --git a/php-twig.spec b/php-twig.spec index 2f7c706..7aee163 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -12,8 +12,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.42.4 -%global github_commit e587180584c3d2d6cb864a0454e777bb6dcb6152 +%global github_version 1.42.5 +%global github_commit 87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e %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 @@ -185,6 +185,9 @@ exit $ret %changelog +* Wed Feb 12 2020 Remi Collet - 1.42.5-1 +- update to 1.42.5 + * Thu Jan 30 2020 Fedora Release Engineering - 1.42.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index b4c2fff..2c7c3e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.42.4-e587180.tgz) = 884d98074d11e70fb5328d8b786b74dc756ca60474951e18384734c93926b2f148feaca9518e32217c014fa79ce43cf4b3137772a26318fad76530a56bd49889 +SHA512 (php-twig-1.42.5-87b2ea9.tgz) = 3f2f188f8e050478fd381b5487ce341b5a2932b53fb6cde688229c04f30a3149e7e48d55406cd4b12de32b59f048b3c22cc936fc46a9b3cdaec3199938efacfe From e5fc3342cdffcd2b9d57c9745505f094c6960d6a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 6 Jul 2020 12:32:57 +0200 Subject: [PATCH 46/68] 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 47/68] - 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 48/68] 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 49/68] 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 50/68] 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 51/68] 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 52/68] - 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 53/68] 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 54/68] 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 55/68] - 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 56/68] 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 57/68] 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 58/68] - 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 59/68] 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 60/68] 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 61/68] 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 62/68] 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 63/68] 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 64/68] 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 65/68] 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 66/68] 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 67/68] 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 68/68] 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