add upstream fix for PHP 8

1 files changed, 13 insertions, 15 deletions

diff --git a/php-pecl-wddx.spec b/php-pecl-wddx.spec
index e413e1d..937654e 100644
--- a/php-pecl-wddx.spec
+++ b/php-pecl-wddx.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-pecl-wddx
 #
-# Copyright (c) 2019 Remi Collet
+# Copyright (c) 2020-2021 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -19,11 +19,11 @@
 %endif
 
 # https://github.com/php/pecl-text-wddx/commits/master
-%global gh_commit   354bfc1d1a7390c14ccc0d0c5eaf83748e40bcf8
+%global gh_commit   f49752c79739c2cea7b4e493cc77d2e4f1855a03
 %global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner    php
 %global gh_project  pecl-text-wddx
-%global gh_date     20190320
+%global gh_date     20210114
 %global with_zts    0%{!?_without_zts:%{?__ztsphp:1}}
 %global pecl_name   wddx
 %global with_tests  0%{!?_without_tests:1}
@@ -35,14 +35,15 @@
 Summary:        Web Distributed Data Exchange
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}
 Version:        %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}}
-Release:        6%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:        7%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 
 License:        PHP
-URL:            http://pecl.php.net/package/%{pecl_name}
+URL:            https://pecl.php.net/package/%{pecl_name}
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{upver}-%{gh_short}.tar.gz
 
+BuildRequires:  make
 BuildRequires:  %{?dtsprefix}gcc
-BuildRequires:  %{?scl_prefix}php-devel > 7.4
+BuildRequires:  %{?scl_prefix}php-devel >= 7.4
 BuildRequires:  %{?scl_prefix}php-xml
 BuildRequires:  %{?scl_prefix}php-pear
 
@@ -62,20 +63,14 @@ 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}" > "7.4"
 Obsoletes:     php74-pecl-%{pecl_name}  <= %{version}
-Obsoletes:     php74w-pecl-%{pecl_name} <= %{version}
+%if "%{php_version}" > "8.0"
+Obsoletes:     php80-pecl-%{pecl_name}  <= %{version}
 %endif
 %endif
 
-%if 0%{?fedora} < 20 && 0%{?rhel} < 7
-# Filter private shared object
-%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
-%{?filter_setup}
-%endif
-
 
 %description
 The Web Distributed Data Exchange, or WDDX, is a free, open XML-based
@@ -198,6 +193,9 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Thu Jan 14 2021 Remi Collet <remi@remirepo.net> - 1.0.0~DEV.20210114-7
+- add upstream fix for PHP 8
+
 * Tue Sep 03 2019 Remi Collet <remi@remirepo.net> - 1.0.0~DEV.20190320-6
 - rebuild for 7.4.0RC1