diff options
| author | Remi Collet <remi@remirepo.net> | 2022-01-18 10:05:25 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2022-01-18 10:05:25 +0100 |
| commit | 05e8711fcb151365c2c72bae472490d0449011ec (patch) | |
| tree | a75f5bb9329066bdd16b2d99cf2f986e2f0d7451 | |
| parent | 8009e44ceb6c617e9579b549b4fa0679cba55f69 (diff) | |
add patch for hiredis 1.0.2 from
https://github.com/nrk/phpiredis/pull/67
| -rw-r--r-- | php-phpiredis.spec | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/php-phpiredis.spec b/php-phpiredis.spec index fcd3d1f..887e90a 100644 --- a/php-phpiredis.spec +++ b/php-phpiredis.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-phpiredis # -# Copyright (c) 2016-2020 Remi Collet +# Copyright (c) 2016-2022 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -33,7 +33,7 @@ Version: 1.0.1 %if 0%{?gh_date} Release: 3%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %else -Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %endif Summary: Client extension for Redis @@ -42,6 +42,10 @@ License: BSD URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz +# Fix build with hiredis >= 0.14 +# https://github.com/nrk/phpiredis/pull/67 +Patch0: %{pecl_name}-pr67.patch + BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear @@ -102,6 +106,8 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO mv %{gh_project}-%{gh_commit} NTS cd NTS +%patch0 -p1 -b .pr67 + # Check extension version ver=$(sed -n '/define PHP_PHPIREDIS_VERSION/{s/.* "//;s/".*$//;p}' php_phpiredis.h) if test "$ver" != "%{version}%{?prever}%{?gh_date:-dev}"; then @@ -223,6 +229,10 @@ exit $ret %changelog +* Tue Jan 18 2022 Remi Collet <remi@remirepo.net> - 1.0.1-4 +- add patch for hiredis 1.0.2 from + https://github.com/nrk/phpiredis/pull/67 + * Wed Sep 01 2021 Remi Collet <remi@remirepo.net> - 1.0.1-3 - rebuild for 8.1.0RC1 |