fix for 7.4

1 files changed, 16 insertions, 16 deletions

diff --git a/php-pecl-xdiff.spec b/php-pecl-xdiff.spec
index 0f800b2..8626486 100644
--- a/php-pecl-xdiff.spec
+++ b/php-pecl-xdiff.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-pecl-xdiff
 #
-# Copyright (c) 2016-2012 Remi Collet
+# Copyright (c) 2016-2019 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -19,16 +19,17 @@
 %global with_zts    0%{!?_without_zts:%{?__ztsphp:1}}
 %global ini_name    40-%{pecl_name}.ini
 
+%global libxdiff_version 0.23
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}
 Version:        2.0.1
-Release:        5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:        6%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 Summary:        File differences/patches
 # libxdiff is LGPLv2+, xdiff extension is PHP
 License:        PHP and LGPLv2+
 URL:            http://pecl.php.net/package/%{pecl_name}
 Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 # bundles the lib, as libxdiff from spot is not compatible
-Source1:        http://www.xmailserver.org/libxdiff-0.23.tar.gz
+Source1:        http://www.xmailserver.org/libxdiff-%{libxdiff_version}.tar.gz
 Source2:        config.m4
 
 BuildRequires:  %{?dtsprefix}gcc
@@ -39,6 +40,7 @@ Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:       %{?scl_prefix}php(api) = %{php_core_api}
 %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
 
+Provides:       bundled(libxdiff) = %{libxdiff_version}
 Provides:       %{?scl_prefix}php-%{pecl_name}               = %{version}
 Provides:       %{?scl_prefix}php-%{pecl_name}%{?_isa}       = %{version}
 Provides:       %{?scl_prefix}php-pecl(%{pecl_name})         = %{version}
@@ -50,16 +52,6 @@ Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{rele
 
 %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
 # Other third party repo stuff
-Obsoletes:     php53-pecl-%{pecl_name}  <= %{version}
-Obsoletes:     php53u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php54-pecl-%{pecl_name}  <= %{version}
-Obsoletes:     php54w-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php55u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php55w-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php56u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php56w-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php70u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php70w-pecl-%{pecl_name} <= %{version}
 %if "%{php_version}" > "7.1"
 Obsoletes:     php71u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php71w-pecl-%{pecl_name} <= %{version}
@@ -69,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
@@ -94,9 +90,10 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 mv %{pecl_name}-%{version} NTS
 
 # Bundles libxdiff
-mv libxdiff-0.23/xdiff NTS/libxdiff
+mv libxdiff-%{libxdiff_version}/xdiff NTS/libxdiff
+sed -e 's/PACKAGE_VERSION/"%{libxdiff_version}"/' -i NTS/libxdiff/xversion.c
 cp -p %{SOURCE2} NTS/config.m4
-cp -p libxdiff-0.23/COPYING libxdiff_COPYING
+cp -p libxdiff-%{libxdiff_version}/COPYING libxdiff_COPYING
 
 # Don't install/register tests
 sed -e 's/role="test"/role="src"/' \
@@ -229,6 +226,9 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Thu Jun  6 2019 Remi Collet <remi@remirepo.net> - 2.0.1-6
+- Fix build with PHP 7.4
+
 * Thu Aug 16 2018 Remi Collet <remi@remirepo.net> - 2.0.1-5
 - rebuild for 7.3.0beta2 new ABI