From 20d7afc5d43be5f5c12675a8927185959be00517 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 25 Oct 2016 07:44:53 +0200 Subject: php-pecl-varnish: 1.2.2 --- php-pecl-varnish.spec | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'php-pecl-varnish.spec') diff --git a/php-pecl-varnish.spec b/php-pecl-varnish.spec index 51c93fb..6309a17 100644 --- a/php-pecl-varnish.spec +++ b/php-pecl-varnish.spec @@ -27,19 +27,13 @@ Summary: Varnish Cache bindings Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 1.2.1 -Release: 9%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 1.2.2 +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: BSD Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz -# Upstream patches -# http://svn.php.net/viewvc?view=revision&revision=340569 -# http://svn.php.net/viewvc?view=revision&revision=340570 -# http://svn.php.net/viewvc?view=revision&revision=340571 -Patch0: %{pecl_name}-upstream.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{?scl_prefix}php-devel > 5.3 BuildRequires: %{?scl_prefix}php-pear @@ -58,8 +52,10 @@ Provides: %{?scl_prefix}php-%{pecl_name} = %{version} Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} +%if "%{?scl_prefix}" != "%{?sub_prefix}" Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} +%endif %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} # Other third party repo stuff @@ -111,7 +107,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -%patch0 -p3 -b .upstream # Sanity check, really often broken extver=$(sed -n '/#define PHP_VARNISH_VERSION/{s/.* "//;s/".*$//;p}' php_varnish.h) @@ -297,6 +292,9 @@ rm -rf %{buildroot} %changelog +* Tue Oct 25 2016 Remi Collet - 1.2.2-1 +- Update to 1.2.2 + * Thu Oct 20 2016 Remi Collet - 1.2.1-9 - add patch for varnish 4.1 (F24) and 5.0 (F25) -- cgit