From bb03dd6b343a8cb27409c2f13024c192f04cbfec Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Mon, 27 Feb 2017 06:46:24 +0100
Subject: php-twig2: 2.2.0

---
 composer.json  |  5 +++--
 php-twig2.spec | 13 +++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 2cd1f1a..b4a0e9e 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,8 @@
     },
     "require-dev": {
         "symfony/phpunit-bridge": "~3.2",
-        "symfony/debug": "~2.7"
+        "symfony/debug": "~2.7",
+        "psr/container": "^1.0"
     },
     "autoload": {
         "psr-0" : {
@@ -46,7 +47,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.1-dev"
+            "dev-master": "2.2-dev"
         }
     }
 }
diff --git a/php-twig2.spec b/php-twig2.spec
index 404847c..a967e6e 100644
--- a/php-twig2.spec
+++ b/php-twig2.spec
@@ -13,7 +13,7 @@
 %global with_tests       0%{!?_without_tests:1}
 %global github_owner     twigphp
 %global github_name      Twig
-%global github_commit    9062992538bc5855a683c6737257bfa18d25a4b8
+%global github_commit    29bb02dde09ff56291d30f7687eb8696918023af
 %global github_short     %(c=%{github_commit}; echo ${c:0:7})
 
 %global composer_vendor  twig
@@ -24,7 +24,7 @@
 %global phpdir      %{_datadir}/php
 
 Name:          php-%{composer_project}2
-Version:       2.1.0
+Version:       2.2.0
 Release:       1%{?dist}
 Summary:       The flexible, fast, and secure template engine for PHP
 
@@ -41,7 +41,8 @@ BuildRequires: php-fedora-autoloader-devel
 BuildRequires: php(language) >= %{php_min_ver}
 BuildRequires: php-composer(phpunit/phpunit)
 BuildRequires: php-composer(symfony/phpunit-bridge)
-BuildRequires: php-composer(symfony/debug)
+BuildRequires: php-composer(symfony/debug) >= 2.7
+BuildRequires: php-composer(psr/container) >= 1.0
 ## phpcompatinfo (computed from version 2.0.0)
 BuildRequires: php-ctype
 BuildRequires: php-date
@@ -120,6 +121,7 @@ require_once '%{buildroot}%{phpdir}/Twig2/autoload.php';
 // Dependencies (require-dev)
 require_once '%{phpdir}/Symfony/Bridge/PhpUnit/autoload.php';
 require_once '%{phpdir}/Symfony/Component/Debug/autoload.php';
+require_once '%{phpdir}/Psr/Container/autoload.php';
 EOF
 
 : Upstream test suite
@@ -146,7 +148,10 @@ exit $RETURN_CODE
 
 
 %changelog
-* Thu Jan 11 2017 Remi Collet <remi@fedoraproject.org> - 2.1.0-1
+* Mon Feb 27 2017 Remi Collet <remi@fedoraproject.org> - 2.2.0-1
+- update to 2.2.0
+
+* Wed Jan 11 2017 Remi Collet <remi@fedoraproject.org> - 2.1.0-1
 - update to 2.1.0
 
 * Fri Jan  6 2017 Remi Collet <remi@fedoraproject.org> - 2.0.0-1
-- 
cgit