From deed8d3652731f6a06509e0cb26218425b71e57a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 26 Jun 2018 15:00:53 +0200 Subject: add patch for PHP 7.3 from https://github.com/lstrojny/pecl-mogilefs/pull/25 --- php-pecl-mogilefs.spec | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/php-pecl-mogilefs.spec b/php-pecl-mogilefs.spec index 8ac4e15..cb820b8 100644 --- a/php-pecl-mogilefs.spec +++ b/php-pecl-mogilefs.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-mogilefs # -# Copyright (c) 2015-2017 Remi Collet +# Copyright (c) 2015-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -25,14 +25,17 @@ Summary: PHP client library to communicate with the MogileFS storage Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: 0.9.3.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;')}} # https://github.com/lstrojny/pecl-mogilefs/issues/15 License: BSD URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz +Patch0: https://patch-diff.githubusercontent.com/raw/lstrojny/pecl-mogilefs/pull/25.patch + BuildRequires: libxml2-devel BuildRequires: neon-devel +BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel > 7 BuildRequires: %{?scl_prefix}php-pear @@ -49,12 +52,6 @@ Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} %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} @@ -95,6 +92,7 @@ sed -e '/role="test"/d' \ -i package.xml cd NTS +%patch0 -p1 -b .pr25 : Sanity check, really often broken extver=$(sed -n '/#define PHP_MOGILEFS_VERSION/{s/.* "//;s/".*$//;p}' php_mogilefs.h) @@ -228,6 +226,10 @@ fi %changelog +* Tue Jun 26 2018 Remi Collet - 0.9.3.1-6 +- add patch for PHP 7.3 from + https://github.com/lstrojny/pecl-mogilefs/pull/25 + * Tue Jul 18 2017 Remi Collet - 0.9.3.1-5 - rebuild for PHP 7.2.0beta1 new API -- cgit