diff --git a/.gitignore b/.gitignore index 6bbc88a..473fc06 100644 --- a/.gitignore +++ b/.gitignore @@ -52,8 +52,3 @@ 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 -/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 041fe1d..81f5d7c 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -1,7 +1,7 @@ # # Fedora spec file for php-twig # -# Copyright (c) 2014-2022 Shawn Iwinski +# Copyright (c) 2014-2021 Shawn Iwinski # Remi Collet # # License: MIT @@ -15,8 +15,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.44.7 -%global github_commit 0887422319889e442458e48e2f3d9add1a172ad5 +%global github_version 1.44.2 +%global github_commit 138c493c5b8ee7cff3821f80b8896d371366b5fe %global github_short %(c=%{github_commit}; echo ${c:0:7}) # Lib @@ -31,11 +31,10 @@ Name: php-%{composer_project} Version: %{github_version} -Release: 9%{?dist} +Release: 1%{?dist} Summary: The flexible, fast, and secure template engine for PHP -# Automatically converted from old format: BSD - review is highly recommended. -License: LicenseRef-Callaway-BSD +License: BSD URL: http://twig.sensiolabs.org Source0: %{name}-%{github_version}-%{github_short}.tgz Source1: makesrc.sh @@ -45,8 +44,14 @@ 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) @@ -159,7 +164,7 @@ sed -e '/listener/d' phpunit.xml.dist > phpunit.xml : Test suite without extension ret=0 -for SCL in "php %{phpunit}" php74 php80 php81 php82; do +for SCL in "php %{phpunit}" php73 php74 php80; do if which $SCL; then set $SCL $1 ${2:-%{_bindir}/phpunit9} $SKIP \ @@ -173,6 +178,7 @@ exit $RETURN_CODE %files +%{!?_licensedir:%global license %%doc} %license LICENSE %doc CHANGELOG README.rst composer.json # Lib @@ -180,60 +186,6 @@ exit $RETURN_CODE %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 1.44.7-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 1.44.7-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Sep 4 2024 Miroslav Suchý - 1.44.7-7 -- convert license to SPDX - -* Fri Jul 19 2024 Fedora Release Engineering - 1.44.7-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 1.44.7-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 1.44.7-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 1.44.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jan 20 2023 Fedora Release Engineering - 1.44.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Sep 29 2022 Remi Collet - 1.44.7-1 -- update to 1.44.7 - -* Fri Jul 22 2022 Fedora Release Engineering - 1.44.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 21 2022 Fedora Release Engineering - 1.44.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Nov 25 2021 Remi Collet - 1.44.6-1 -- update to 1.44.6 (no change) -- drop patch merged upstream - -* Wed Sep 22 2021 Remi Collet - 1.44.5-1 -- update to 1.44.5 -- add patch for test suite from https://github.com/twigphp/Twig/pull/3563 - -* 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 - -* 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 - * Wed Jan 6 2021 Remi Collet - 1.44.2-1 - update to 1.44.2 diff --git a/sources b/sources index a2b94d0..ccd9643 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-twig-1.44.7-0887422.tgz) = 7dbf734b7113dd0e1be34710d4a369cd902ab955346c4348a003a9844c8d55316f0f0713fe208d2b62f03cf4c799885432f79162b1c62c7b9304862f5b7c89b0 +SHA512 (php-twig-1.44.2-138c493.tgz) = 2a98e8c53c34a56d6989ebdc7033ce727be1dc4f46cc0c430e4bb5b60d02bbc990c1a37a97275dc5be0e42bbe762dc4da5f2595aaca1c17616be94f9d63cd41a