From 47238f813474138159f1366d6786dac41e116a50 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 21 Apr 2021 14:39:30 +0200 Subject: add upstream patch to fix typo in function name --- php-pecl-stats.spec | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'php-pecl-stats.spec') diff --git a/php-pecl-stats.spec b/php-pecl-stats.spec index 739ce3a..d3390e7 100644 --- a/php-pecl-stats.spec +++ b/php-pecl-stats.spec @@ -19,18 +19,20 @@ Summary: Routines for statistical computation Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 2.0.3 -Release: 9%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 10%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz -# Upstream patch for PHP 8 +# Upstream cumulative patch # Mostly output of: git diff 2.0.3 -- *.c *.h tests/ -Patch0: %{pecl_name}-php8.patch +Patch0: %{pecl_name}-php7.patch +# Upstream patch for PHP 8 +Patch1: %{pecl_name}-php8.patch BuildRequires: make BuildRequires: %{?dtsprefix}gcc -BuildRequires: %{?scl_prefix}php-devel >= 7 +BuildRequires: %{?scl_prefix}php-devel >= 7.0 BuildRequires: %{?scl_prefix}php-pear Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} @@ -76,8 +78,12 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -%if "%{php_version}" > "8.0" %patch0 -p1 -b .upstream +%if "%{php_version}" > "8.0" +%patch1 -p1 -b .php8 +%else +# don't deprecate function with typo +sed -e 's/PHP_DEP_FALIAS/PHP_FALIAS/' -i php_stats.c %endif # Sanity check, really often broken @@ -211,6 +217,9 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Wed Apr 21 2021 Remi Collet - 2.0.3-10 +- add upstream patch to fix typo in function name + * Mon Apr 19 2021 Remi Collet - 2.0.3-9 - add upstream patch for PHP 8 -- cgit