diff options
-rw-r--r-- | composer.json | 2 | ||||
-rw-r--r-- | php-symfony.spec | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/composer.json b/composer.json index 5dbebcc..8da4f25 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "require": { "php": ">=5.3.9", "doctrine/common": "~2.4", - "twig/twig": "~1.28|~2.0", + "twig/twig": "~1.34|~2.4", "psr/log": "~1.0", "symfony/security-acl": "~2.7|~3.0.0", "symfony/polyfill-apcu": "~1.1", diff --git a/php-symfony.spec b/php-symfony.spec index 3dde0f1..f55473c 100644 --- a/php-symfony.spec +++ b/php-symfony.spec @@ -13,8 +13,8 @@ %global github_owner symfony %global github_name symfony -%global github_version 2.8.21 -%global github_commit 17002cbb4be8b3b0d6516defe4ed839ad459994b +%global github_version 2.8.22 +%global github_commit 2404550f13f71470206227c98c2d53f0f4cbbb3e %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global composer_vendor symfony @@ -86,8 +86,8 @@ # instead of php-symfony-security-acl3 %global symfony_security_acl_min_ver 2.7 %global symfony_security_acl_max_ver 3.0 -# "twig/twig": "~1.28|~2.0" -%global twig_min_ver 1.28 +# "twig/twig": "~1.34|~2.4" +%global twig_min_ver 1.34 %global twig_max_ver 3.0 %if 0%{?fedora} < 21 && 0%{?rhel} < 7 @@ -2694,6 +2694,10 @@ exit $RET # ############################################################################## %changelog +* Thu Jun 8 2017 Remi Collet <remi@remirepo.net> - 2.8.22-1 +- Update to 2.8.22 +- raise dependency on twig 1.34 / 2.4 with namespace + * Tue May 30 2017 Remi Collet <remi@remirepo.net> - 2.8.21-1 - Update to 2.8.21 |