From 0143df7fe57623fc3ff1ac0e80edbf8aeb70a762 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 3 Sep 2020 07:36:37 +0200 Subject: update to 3.1.5 drop patch merged upstream --- php-pecl-igbinary.spec | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'php-pecl-igbinary.spec') diff --git a/php-pecl-igbinary.spec b/php-pecl-igbinary.spec index 230422b..03c6e70 100644 --- a/php-pecl-igbinary.spec +++ b/php-pecl-igbinary.spec @@ -25,7 +25,7 @@ #global gh_date 20161018 %global ini_name 40-%{pecl_name}.ini -%global upstream_version 3.1.4 +%global upstream_version 3.1.5 #global upstream_prever a1 Summary: Replacement for the standard PHP serializer @@ -35,15 +35,12 @@ Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} Release: 0.12.%{gh_date}.%{gh_short}%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} Source0: https://github.com/%{pecl_name}/%{pecl_name}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz %else -Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz %endif License: BSD URL: https://pecl.php.net/package/igbinary -Patch0: igbinary-tests.patch -Patch1: https://patch-diff.githubusercontent.com/raw/igbinary/igbinary/pull/284.patch - BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-devel > 7 @@ -86,7 +83,6 @@ Obsoletes: php73w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.4" Obsoletes: php74-pecl-%{pecl_name} <= %{version} -Obsoletes: php74w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "8.0" Obsoletes: php80-pecl-%{pecl_name} <= %{version} @@ -147,9 +143,6 @@ mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS %{?_licensedir:sed -e '/COPYING/s/role="doc"/role="src"/' -i package.xml} cd NTS -%patch0 -p1 -b .up -%patch1 -p1 -b .pr - # Check version subdir="php$(%{__php} -r 'echo (PHP_MAJOR_VERSION < 7 ? 5 : 7);')" extver=$(sed -n '/#define PHP_IGBINARY_VERSION/{s/.* "//;s/".*$//;p}' src/$subdir/igbinary.h) @@ -308,6 +301,10 @@ fi %changelog +* Thu Sep 3 2020 Remi Collet - 3.1.5-1 +- update to 3.1.5 +- drop patch merged upstream + * Wed Sep 2 2020 Remi Collet - 3.1.4-2 - add upstream patch for test suite - add patch for PHP 8.0.0beta3 from -- cgit