summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-10-30 08:14:22 +0100
committerRemi Collet <fedora@famillecollet.com>2015-10-30 08:14:22 +0100
commitcb70513496618fe8adfb10b6e79dca6df9629f98 (patch)
tree7bad7049b1ad6139d5acbceeefddc8176d27b3c0
parent2cc760abd56609293c0514bc253a48548f60ecbd (diff)
php-twig: 1.23.0
-rw-r--r--REFLECTION2
-rw-r--r--php-twig.spec12
2 files changed, 9 insertions, 5 deletions
diff --git a/REFLECTION b/REFLECTION
index 811c012..3cfe6cd 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #201 twig version 1.22.3 ] {
+Extension [ <persistent> extension #201 twig version 1.23.0 ] {
- Functions {
Function [ <internal:twig> function twig_template_get_attributes ] {
diff --git a/php-twig.spec b/php-twig.spec
index f58ae8f..0dc4d5d 100644
--- a/php-twig.spec
+++ b/php-twig.spec
@@ -14,8 +14,8 @@
%global github_owner twigphp
%global github_name Twig
-%global github_version 1.22.3
-%global github_commit ebfc36b7e77b0c1175afe30459cf943010245540
+%global github_version 1.23.0
+%global github_commit 5868cd822fd6cf626d5f805439575f9c323cee2a
%global github_short %(c=%{github_commit}; echo ${c:0:7})
@@ -256,9 +256,10 @@ EXT_VERSION=`grep PHP_TWIG_VERSION ext/NTS/php_twig.h | awk '{print $3}' | sed '
%if %{with_tests}
: Skip tests known to fail
-sed -e 's#function testGetAttributeExceptions#function SKIP_testGetAttributeExceptions#' \
- -e 's/function testGetAttributeWithTemplateAsObject/function skip_testGetAttributeWithTemplateAsObject/' \
+%if 0%{?rhel} == 5 || 0%{?rhel} == 6
+sed -e 's/function testGetAttributeWithTemplateAsObject/function skip_testGetAttributeWithTemplateAsObject/' \
-i test/Twig/Tests/TemplateTest.php
+%endif
: Test suite without extension
%{_bindir}/phpunit --bootstrap %{buildroot}%{phpdir}/Twig/autoload.php --verbose
@@ -294,6 +295,9 @@ rm -rf %{buildroot}
%changelog
+* Fri Oct 30 2015 Remi Collet <remi@fedoraproject.org> - 1.23.0-1
+- Update to 1.23.0
+
* Tue Oct 13 2015 Remi Collet <remi@fedoraproject.org> - 1.22.3-1
- Update to 1.22.3