From a7f181a0542338b18dc21ab43d77af5d2bdb64f0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 23 Aug 2019 15:02:43 +0200 Subject: add patch for 7.4 from https://github.com/weltling/parle/pull/17 --- php-pecl-parle.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'php-pecl-parle.spec') diff --git a/php-pecl-parle.spec b/php-pecl-parle.spec index b351a1c..0a9d7ef 100644 --- a/php-pecl-parle.spec +++ b/php-pecl-parle.spec @@ -31,13 +31,14 @@ BuildRequires: devtoolset-6-toolchain Summary: Parsing and lexing Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: 0.8.1 -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;')}} # Extension is BSD, libraries are Boost License: BSD and Boost URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz Patch0: https://github.com/weltling/parle/commit/7c692b9880aa6a501b6627d923bbc8ed1da1465f.patch +Patch1: https://patch-diff.githubusercontent.com/raw/weltling/parle/pull/17.patch BuildRequires: %{?scl_prefix}php-devel >= 7 BuildRequires: %{?scl_prefix}php-pear @@ -120,6 +121,7 @@ mv NTS/lib/parsertl14/parsertl/licence_1_0.txt NTS/LICENSE.parsertl14 cd NTS %patch0 -p1 -b .up +%patch1 -p1 -b .pr17 # Sanity check, really often broken extver=$(sed -n '/#define PHP_PARLE_VERSION/{s/.* "//;s/".*$//;p}' php_parle.h) @@ -198,7 +200,7 @@ cd NTS %if %{with_tests} : Upstream test suite -make test +make test "TESTS=--show-diff" %endif %if %{with_zts} @@ -210,7 +212,7 @@ cd ../ZTS %if %{with_tests} : Upstream test suite -make test +make test "TESTS=--show-diff" %endif %endif @@ -250,6 +252,10 @@ fi %changelog +* Fri Aug 23 2019 Remi Collet - 0.8.1-7 +- add patch for 7.4 from + https://github.com/weltling/parle/pull/17 + * Tue Jun 4 2019 Remi Collet - 0.8.1-6 - add upstream patch for 7.4 -- cgit