From cf946fcc68185dc5696d895c8b6fc248b4c7e2b1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 9 Sep 2021 12:04:38 +0200 Subject: add patch for PHP 8.1 from https://github.com/php-gnupg/php-gnupg/pull/35 --- php-pecl-gnupg.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'php-pecl-gnupg.spec') diff --git a/php-pecl-gnupg.spec b/php-pecl-gnupg.spec index cd2eed0..2db4bbf 100644 --- a/php-pecl-gnupg.spec +++ b/php-pecl-gnupg.spec @@ -25,12 +25,14 @@ Summary: Wrapper around the gpgme library Name: %{?sub_prefix}php-pecl-gnupg Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: BSD URL: https://pecl.php.net/package/gnupg Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz +Patch0: 0001-Fix-iterator-prototypes-for-PHP-8.1.patch + BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel @@ -72,6 +74,9 @@ Obsoletes: php74-pecl-%{pecl_name} <= %{version} %if "%{php_version}" > "8.0" Obsoletes: php80-pecl-%{pecl_name} <= %{version} %endif +%if "%{php_version}" > "8.1" +Obsoletes: php81-pecl-%{pecl_name} <= %{version} +%endif %endif @@ -99,6 +104,8 @@ EOF mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS cd NTS +%patch0 -p1 -b .php81 + # Check extension version extver=$(sed -n '/#define PHP_GNUPG_VERSION/{s/.* "//;s/".*$//;p}' php_gnupg.h) if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then @@ -235,6 +242,10 @@ cd ../ZTS %changelog +* Thu Sep 9 2021 Remi Collet - 1.5.0-2 +- add patch for PHP 8.1 from + https://github.com/php-gnupg/php-gnupg/pull/35 + * Mon Apr 12 2021 Remi Collet - 1.5.0-1 - Update to 1.5.0 -- cgit