From 671ad3bdcf2ea60f4bc79dbcbfab127acc115e84 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 23 May 2019 13:29:14 +0200 Subject: add upstream patch for 7.4 --- php-pecl-oauth.spec | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/php-pecl-oauth.spec b/php-pecl-oauth.spec index 56241f7..4d51041 100644 --- a/php-pecl-oauth.spec +++ b/php-pecl-oauth.spec @@ -19,12 +19,14 @@ Name: %{?sub_prefix}php-pecl-oauth Version: 2.0.3 -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Summary: PHP OAuth consumer extension License: BSD URL: http://pecl.php.net/package/oauth Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz +Patch0: https://github.com/php/pecl-web_services-oauth/commit/e27ff18ac768aae1cf955111179ec68307d37475.patch + BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7 BuildRequires: %{?scl_prefix}php-pear @@ -59,9 +61,13 @@ Obsoletes: php72u-pecl-%{pecl_name} <= %{version} Obsoletes: php72w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.3" -Obsoletes: php73u-pecl-%{pecl_name} <= %{version} +Obsoletes: php73-pecl-%{pecl_name} <= %{version} 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 %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -93,6 +99,7 @@ sed -e 's/role="test"/role="src"/' \ cd NTS sed -e '/PHP_OAUTH_VERSION/s/2.0.3-dev/2.0.3/' -i php_oauth.h +%patch0 -p1 # Sanity check, really often broken extver=$(sed -n '/#define PHP_OAUTH_VERSION/{s/.* //;s/".*$//;p}' php_oauth.h) @@ -201,6 +208,9 @@ fi %changelog +* Thu May 23 2019 Remi Collet - 2.0.3-3 +- add upstream patch for 7.4 + * Fri Mar 1 2019 Remi Collet - 2.0.3-2 - rebuild -- cgit