From dad988f3a377968148126f7aa84b0ef9d26060e7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 11 Aug 2018 06:18:26 +0200 Subject: v3.6.1 --- php-pecl-protobuf.spec | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'php-pecl-protobuf.spec') diff --git a/php-pecl-protobuf.spec b/php-pecl-protobuf.spec index 40da3a8..10a7592 100644 --- a/php-pecl-protobuf.spec +++ b/php-pecl-protobuf.spec @@ -25,15 +25,12 @@ Summary: Mechanism for serializing structured data Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 3.6.0 -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 3.6.1 +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}%{?prever}.tgz -Patch0: https://patch-diff.githubusercontent.com/raw/google/protobuf/pull/4873.patch - BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 5.5.9 BuildRequires: %{?scl_prefix}php-pear @@ -69,6 +66,10 @@ Obsoletes: php71w-pecl-%{pecl_name} <= %{version} Obsoletes: php72u-pecl-%{pecl_name} <= %{version} Obsoletes: php72w-pecl-%{pecl_name} <= %{version} %endif +%if "%{php_version}" > "7.3" +Obsoletes: php73u-pecl-%{pecl_name} <= %{version} +Obsoletes: php73w-pecl-%{pecl_name} <= %{version} +%endif %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -99,8 +100,6 @@ sed -e 's/role="test"/role="src"/' \ cd NTS -%patch0 -p5 -b .pr4873 - # Sanity check, really often broken extver=$(sed -n '/#define PHP_PROTOBUF_VERSION/{s/.* "//;s/".*$//;p}' protobuf.h) if test "x${extver}" != "x%{version}%{?prever}"; then @@ -217,6 +216,13 @@ fi %changelog +* Sat Aug 11 2018 Remi Collet - 3.6.1-1 +- update to 3.6.1 +- drop patch merged upstream + +* Wed Jul 18 2018 Remi Collet - 3.6.0-3 +- rebuild for 7.3.0alpha4 new ABI + * Fri Jul 6 2018 Remi Collet - 3.6.0-2 - add patch for PHP 7.3 from https://github.com/google/protobuf/pull/4873 -- cgit