From adfc16dd3a051c7c53dbb607a138295c50d02747 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 27 Jun 2018 16:20:24 +0200 Subject: add upstream patches for PHP 7.3 and patch from https://github.com/bwoebi/php-uv/pull/60/files --- php-pecl-uv.spec | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'php-pecl-uv.spec') diff --git a/php-pecl-uv.spec b/php-pecl-uv.spec index 1d8f205..690b3cd 100644 --- a/php-pecl-uv.spec +++ b/php-pecl-uv.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-uv # -# Copyright (c) 2016-2017 Remi Collet +# Copyright (c) 2016-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -25,6 +25,12 @@ Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz +Patch0: https://github.com/bwoebi/php-uv/commit/880d84cd838f334d88adb888f8a3b744194560d3.patch +Patch1: https://github.com/bwoebi/php-uv/commit/2ba4d96379a826050d91b039775e9d1e148d5ef2.patch +Patch2: https://github.com/bwoebi/php-uv/commit/fc685d1cb58746a8865fc4b86a38f90219de90ed.patch +Patch3: https://patch-diff.githubusercontent.com/raw/bwoebi/php-uv/pull/60.patch + +BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel > 7 BuildRequires: %{?scl_prefix}php-pear BuildRequires: pkgconfig(libuv) >= 1.0.0 @@ -81,6 +87,10 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS +%patch0 -p1 -b .up0 +%patch1 -p1 -b .up1 +%patch2 -p1 -b .up2 +%patch3 -p1 -b .pr60 # Sanity check, really often broken extver=$(sed -n '/define PHP_UV_VERSION/{s/.* "//;s/".*$//;p}' php_uv.h) @@ -148,7 +158,7 @@ do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done -%if 0%{?fedora} < 24 +%if 0%{?fedora} < 24 && 0%{?rhel} < 8 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear if [ -x %{__pecl} ] ; then @@ -226,6 +236,10 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Wed Jun 27 2018 Remi Collet - 0.2.2-3 +- add upstream patches for PHP 7.3 and patch from + https://github.com/bwoebi/php-uv/pull/60/files + * Tue Jul 18 2017 Remi Collet - 0.2.2-2 - rebuild for PHP 7.2.0beta1 new API -- cgit