summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--REFLECTION2
-rw-r--r--php-twig.spec21
2 files changed, 15 insertions, 8 deletions
diff --git a/REFLECTION b/REFLECTION
index 1083f89..16d5fcf 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #75 twig version 1.34.4 ] {
+Extension [ <persistent> extension #78 twig version 1.35.1 ] {
- Functions {
Function [ <internal:twig> function twig_template_get_attributes ] {
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