From 43caa63acb50be0d4e8389147328be8b5a72157e Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Wed, 26 Oct 2016 15:50:15 +0200
Subject: php-twig-extensions: 1.4.1

---
 php-twig-extensions.spec | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'php-twig-extensions.spec')

diff --git a/php-twig-extensions.spec b/php-twig-extensions.spec
index cbc5533..4cf699c 100644
--- a/php-twig-extensions.spec
+++ b/php-twig-extensions.spec
@@ -12,8 +12,8 @@
 
 %global github_owner     twigphp
 %global github_name      Twig-extensions
-%global github_version   1.4.0
-%global github_commit    531eaf4b9ab778b1d7cdd10d40fc6aa74729dfee
+%global github_version   1.4.1
+%global github_commit    f0bb8431c8691f5a39f1017d9a5967a082bf01ff
 
 %global composer_vendor  twig
 %global composer_project extensions
@@ -22,7 +22,8 @@
 %global symfony_min_ver  2.3
 %global symfony_max_ver  3.0
 # "twig/twig": "~1.20|~2.0"
-%global twig_min_ver     1.20
+# 1.27 to avoid Error: Call to undefined method Twig_Node_Expression_Name::getTemplateLine()
+%global twig_min_ver     1.27
 %global twig_max_ver     3.0
 
 # Build using "--without tests" to disable tests
@@ -32,7 +33,7 @@
 
 Name:          php-%{composer_vendor}-%{composer_project}
 Version:       %{github_version}
-Release:       2%{?dist}
+Release:       1%{?dist}
 Summary:       Twig extensions
 
 Group:         Development/Libraries
@@ -40,8 +41,6 @@ License:       MIT
 URL:           http://twig.sensiolabs.org/doc/extensions/index.html
 Source0:       https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz
 
-Patch0:        %{name}-upstream.patch
-
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:     noarch
 # Tests
@@ -78,8 +77,6 @@ Common additional features for Twig that do not directly belong in core Twig.
 %prep
 %setup -qn %{github_name}-%{github_commit}
 
-%patch0 -p1 -b .upstream
-
 : Create autoloader
 cat <<'AUTOLOAD' | tee lib/Twig/Extensions/autoload.php
 <?php
@@ -108,6 +105,9 @@ cp -rp lib/* %{buildroot}%{phpdir}/
 
 
 %check
+sed -e 's/testLocalizedDateFilterWithDateTimeZone/SKIPtestLocalizedDateFilterWithDateTimeZone/' \
+    -i test/Twig/Tests/Extension/IntlTest.php
+
 %if %{with_tests}
 # remirepo:11
 run=0
@@ -146,6 +146,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 26 2016 Remi Collet <remi@fedoraproject.org> - 1.4.1-1
+- update to 1.4.1
+
 * Tue Oct  4 2016 Remi Collet <remi@fedoraproject.org> - 1.4.0-2
 - add upstream patch for test suite with twig 1.26
 
-- 
cgit