From 031085e89852a47a2a0a89e218d2965dc8794d7b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 3 Sep 2020 10:30:56 +0200 Subject: add upstream patch for PHP 8 --- php-pecl-krb5.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'php-pecl-krb5.spec') diff --git a/php-pecl-krb5.spec b/php-pecl-krb5.spec index 9c0d034..b46be2f 100644 --- a/php-pecl-krb5.spec +++ b/php-pecl-krb5.spec @@ -32,11 +32,13 @@ Summary: Kerberos authentification extension Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: 1.1.3 -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: MIT URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz +Patch0: %{pecl_name}-php8.patch + BuildRequires: %{?dtsprefix}gcc BuildRequires: krb5-devel >= 1.8 BuildRequires: pkgconfig(com_err) @@ -56,31 +58,28 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{rele Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} %endif -%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} +%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff %if "%{php_version}" > "5.6" Obsoletes: php56u-pecl-%{pecl_name} <= %{version} -Obsoletes: php56w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.0" Obsoletes: php70u-pecl-%{pecl_name} <= %{version} -Obsoletes: php70w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.1" Obsoletes: php71u-pecl-%{pecl_name} <= %{version} -Obsoletes: php71w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.2" Obsoletes: php72u-pecl-%{pecl_name} <= %{version} -Obsoletes: php72w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.3" 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 +%if "%{php_version}" > "8.0" +Obsoletes: php80-pecl-%{pecl_name} <= %{version} %endif %endif @@ -119,6 +118,7 @@ mv %{pecl_name}-%{version} NTS %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} cd NTS +%patch0 -p0 -b .up # Sanity check, really often broken extver=$(sed -n '/#define PHP_KRB5_VERSION/{s/.* "//;s/".*$//;p}' php_krb5.h) @@ -252,6 +252,9 @@ cd ../ZTS %changelog +* Thu Sep 3 2020 Remi Collet - 1.1.3-2 +- add upstream patch for PHP 8 + * Wed Feb 26 2020 Remi Collet - 1.1.3-1 - update to 1.1.3 - fix License = MIT -- cgit