summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-01-26 17:26:27 +0100
committerRemi Collet <fedora@famillecollet.com>2015-01-26 17:26:27 +0100
commit0aa363879c1735cbe56f67fc927b3806e513d266 (patch)
tree87b11914b462d48fab139abf79232409b851a170
parentbfd3ca354d6373ff2fd86140973be0177e32ec80 (diff)
php-twig: 1.18.0
-rw-r--r--REFLECTION2
-rw-r--r--php-twig.spec23
2 files changed, 14 insertions, 11 deletions
diff --git a/REFLECTION b/REFLECTION
index 0285781..432509f 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #180 twig version 1.17.0 ] {
+Extension [ <persistent> extension #180 twig version 1.18.0 ] {
- Functions {
Function [ <internal:twig> function twig_template_get_attributes ] {
diff --git a/php-twig.spec b/php-twig.spec
index bb2e57b..b4ca1e4 100644
--- a/php-twig.spec
+++ b/php-twig.spec
@@ -12,8 +12,8 @@
%global github_owner fabpot
%global github_name Twig
-%global github_version 1.17.0
-%global github_commit 2493970fa4d587eca73f77e6d8bd48a8bdd4c608
+%global github_version 1.18.0
+%global github_commit 4cf7464348e7f9893a93f7096a90b73722be99cf
# Lib
%global composer_vendor twig
@@ -114,17 +114,17 @@ Obsoletes: %{?scl_prefix}php-channel-twig
%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1}
# Other third party repo stuff
-Obsoletes: php53-%{extname} <= %{version}
-Obsoletes: php53u-%{extname} <= %{version}
-Obsoletes: php54-%{extname} <= %{version}
-Obsoletes: php54w-%{extname} <= %{version}
+Obsoletes: php53-%{ext_name} <= %{version}
+Obsoletes: php53u-%{ext_name} <= %{version}
+Obsoletes: php54-%{ext_name} <= %{version}
+Obsoletes: php54w-%{ext_name} <= %{version}
%if "%{php_version}" > "5.5"
-Obsoletes: php55u-%{extname} <= %{version}
-Obsoletes: php55w-%{extname} <= %{version}
+Obsoletes: php55u-%{ext_name} <= %{version}
+Obsoletes: php55w-%{ext_name} <= %{version}
%endif
%if "%{php_version}" > "5.6"
-Obsoletes: php56u-%{extname} <= %{version}
-Obsoletes: php56w-%{extname} <= %{version}
+Obsoletes: php56u-%{ext_name} <= %{version}
+Obsoletes: php56w-%{ext_name} <= %{version}
%endif
%endif
@@ -263,6 +263,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Jan 26 2015 Remi Collet <remi@fedoraproject.org> - 1.18.0-1
+- Update to 1.18.0
+
* Wed Jan 14 2015 Remi Collet <remi@fedoraproject.org> - 1.17.0-1
- Update to 1.17.0