diff options
| author | Remi Collet <remi@remirepo.net> | 2018-03-03 06:26:46 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2018-03-03 06:26:46 +0100 |
| commit | 7eef9fde59bc17be5da8470e4caaaa6c6ba6871d (patch) | |
| tree | 34d19bcda5422a14c0880dfebd3c833d93b4a75b /php-twig.spec | |
| parent | 8452434b26ff025f6b01ae30702325bc3ad5822e (diff) | |
v1.35.1
Diffstat (limited to 'php-twig.spec')
| -rw-r--r-- | php-twig.spec | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/php-twig.spec b/php-twig.spec index fac26d0..6c1b9ae 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -3,7 +3,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 @@ -30,8 +30,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 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %if "%{php_version}" < "7" @@ -64,7 +64,6 @@ Version: %{github_version} Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} 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}/%{pkg_name}-%{github_version}-%{github_short}.tar.gz @@ -73,10 +72,14 @@ BuildRequires: %{?scl_prefix}php-devel >= %{php_min_ver} %if %{with_tests} # For 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: %{?scl_prefix}php-ctype BuildRequires: %{?scl_prefix}php-date @@ -312,7 +315,7 @@ sed -e '/listener/d' phpunit.xml.dist > phpunit.xml : Test suite without extension ret=0 -for cmd in php php56 php70 php71 php72; do +for cmd in php php70 php71 php72; do if which $cmd; then $cmd %{_bindir}/phpunit --verbose || ret=1 fi @@ -349,6 +352,10 @@ exit $ret %changelog +* Sat Mar 3 2018 Remi Collet <remi@remirepo.net> - 1.35.1-1 +- Update to 1.35.1 +- use range dependencies on F27+ + * Thu Sep 28 2017 Remi Collet <remi@remirepo.net> - 1.35.0-1 - Update to 1.35.0 |