diff options
| -rw-r--r-- | php-twig2.spec | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/php-twig2.spec b/php-twig2.spec index c16355b..104fd63 100644 --- a/php-twig2.spec +++ b/php-twig2.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-twig # -# Copyright (c) 2014-2017 Shawn Iwinski <shawn.iwinski@gmail.com> +# Copyright (c) 2014-2018 Shawn Iwinski <shawn.iwinski@gmail.com> # Remi Collet <remi@fedoraproject.org> # # License: MIT @@ -13,7 +13,7 @@ %global with_tests 0%{!?_without_tests:1} %global github_owner twigphp %global github_name Twig -%global github_commit eddb97148ad779f27e670e1e3f19fb323aedafeb +%global github_commit 43b23931c606aa6d6a91ca47d9f7570633351a6c %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global composer_vendor twig @@ -24,11 +24,10 @@ %global phpdir %{_datadir}/php Name: php-%{composer_project}2 -Version: 2.4.4 +Version: 2.4.5 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}-%{version}-%{github_short}.tar.gz @@ -40,10 +39,14 @@ BuildRequires: php-fedora-autoloader-devel # For tests BuildRequires: php(language) >= %{php_min_ver} 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 2.4.2) BuildRequires: php-ctype BuildRequires: php-date @@ -155,6 +158,10 @@ exit $RETURN_CODE %changelog +* Sat Mar 3 2018 Remi Collet <remi@remirepo.net> - 2.4.5-1 +- Update to 2.4.5 +- use range dependencies on F27+ + * Thu Sep 28 2017 Remi Collet <remi@remirepo.net> - 2.4.4-1 - Update to 2.4.4 |