From 91a856e604ad211b932fe42ff1ccce314bcb672b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 28 Oct 2022 09:49:45 +0200 Subject: test build with patch from PR --- PHPINFO | 3 +++ php-pecl-rnp.spec | 16 ++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/PHPINFO b/PHPINFO index c859cc9..11c522b 100644 --- a/PHPINFO +++ b/PHPINFO @@ -2,3 +2,6 @@ rnp rnp support => enabled +rnp extension version => 0.1.1 +rnp library version => 0.16.2 +rnp backend => Botan version 2.18.2 diff --git a/php-pecl-rnp.spec b/php-pecl-rnp.spec index a112883..972632e 100644 --- a/php-pecl-rnp.spec +++ b/php-pecl-rnp.spec @@ -25,12 +25,16 @@ Summary: wrapper around the RNP library Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} -License: BSD 2-Clause +License: BSD-2-Clause URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz +Patch0: https://patch-diff.githubusercontent.com/raw/rnpgp/php-rnp/pull/3.patch +Patch1: https://patch-diff.githubusercontent.com/raw/rnpgp/php-rnp/pull/4.patch +Patch2: https://patch-diff.githubusercontent.com/raw/rnpgp/php-rnp/pull/5.patch + BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 8.0 @@ -63,6 +67,9 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS +%patch0 -p1 -b .pr3 +%patch1 -p1 -b .pr4 +%patch2 -p1 -b .pr5 # Check version as upstream often forget to update this extver=$(sed -n '/define PHP_RNP_VERSION/{s/.* "//;s/".*$//;p}' php_rnp.h) @@ -186,5 +193,10 @@ fi %changelog +* Fri Oct 28 2022 Remi Collet - 1.2.8-2 +- open https://github.com/rnpgp/php-rnp/pull/3 extension version +- open https://github.com/rnpgp/php-rnp/pull/4 backend name/version +- open https://github.com/rnpgp/php-rnp/pull/5 build warnings + * Thu Oct 27 2022 Remi Collet - 1.2.8-1 - initial package -- cgit