From ccce96c4b9e9899874adc85aa6c8cad86fd61128 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 4 Jun 2019 16:20:16 +0200
Subject: add upstream patch for 7.4

---
 php-pecl-parle.spec | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'php-pecl-parle.spec')

diff --git a/php-pecl-parle.spec b/php-pecl-parle.spec
index 1b02412..b351a1c 100644
--- a/php-pecl-parle.spec
+++ b/php-pecl-parle.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-pecl-parle
 #
-# Copyright (c) 2017-2018 Remi Collet
+# Copyright (c) 2017-2019 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -21,7 +21,7 @@
 # After json
 %global ini_name     40-%{pecl_name}.ini
 
-%if 0%{?rhel}
+%if 0%{?rhel} == 6 || 0%{?rhel} == 7
 # Always use DTS as c++14 is required
 BuildRequires: devtoolset-6-toolchain
 %global dtsenable source /opt/rh/devtoolset-6/enable
@@ -31,12 +31,14 @@ BuildRequires: devtoolset-6-toolchain
 Summary:        Parsing and lexing
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}
 Version:        0.8.1
-Release:        4%{?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;')}}
 # 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
+
 BuildRequires:  %{?scl_prefix}php-devel >= 7
 BuildRequires:  %{?scl_prefix}php-pear
 BuildRequires:  %{?scl_prefix}php-json
@@ -75,9 +77,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
@@ -113,6 +119,8 @@ mv NTS/lib/parsertl14/parsertl/licence_1_0.txt NTS/LICENSE.parsertl14
 %endif
 
 cd NTS
+%patch0 -p1 -b .up
+
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_PARLE_VERSION/{s/.* "//;s/".*$//;p}' php_parle.h)
 if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then
@@ -242,6 +250,12 @@ fi
 
 
 %changelog
+* Tue Jun  4 2019 Remi Collet <remi@remirepo.net> - 0.8.1-6
+- add upstream patch for 7.4
+
+* Wed Dec 12 2018 Remi Collet <remi@remirepo.net> - 0.8.1-5
+- cleanup for EL-8
+
 * Thu Aug 16 2018 Remi Collet <remi@remirepo.net> - 0.8.1-4
 - rebuild for 7.3.0beta2 new ABI
 
-- 
cgit