From 2e29f48b249d426c4b571367f05979b276f0779a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 21 Apr 2017 10:35:26 +0200 Subject: v1.33.2 --- REFLECTION | 2 +- php-twig.spec | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/REFLECTION b/REFLECTION index b550f15..0c399ec 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #75 twig version 1.33.0 ] { +Extension [ extension #75 twig version 1.33.2 ] { - Functions { Function [ function twig_template_get_attributes ] { diff --git a/php-twig.spec b/php-twig.spec index cc8e794..31b37da 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -30,8 +30,8 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.33.0 -%global github_commit 05cf49921b13f6f01d3cfdf9018cfa7a8086fd5a +%global github_version 1.33.2 +%global github_commit dd6ca96227917e1e85b41c7c3cc6507b411e0927 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %if "%{php_version}" < "7" @@ -69,7 +69,6 @@ License: BSD URL: http://twig.sensiolabs.org Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{pkg_name}-%{github_version}-%{github_short}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{?scl_prefix}php-devel >= %{php_min_ver} %if %{with_tests} # For tests @@ -160,6 +159,10 @@ Obsoletes: php70w-%{ext_name} <= %{version} Obsoletes: php71u-%{ext_name} <= %{version} Obsoletes: php71w-%{ext_name} <= %{version} %endif +%if "%{php_version}" > "7.2" +Obsoletes: php72u-%{ext_name} <= %{version} +Obsoletes: php72w-%{ext_name} <= %{version} +%endif %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -247,7 +250,6 @@ popd %install -rm -rf %{buildroot} %{?dtsenable} : Lib @@ -342,12 +344,7 @@ exit $ret %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license LICENSE %doc CHANGELOG README.rst composer.json @@ -367,6 +364,9 @@ rm -rf %{buildroot} %changelog +* Fri Apr 21 2017 Remi Collet - 1.33.2-1 +- Update to 1.33.2 + * Thu Mar 23 2017 Remi Collet - 1.33.0-1 - Update to 1.33.0 -- cgit