From c0659c32316858d9b0fc081d5803cf2fea0bfe5b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 15 Jan 2021 15:46:37 +0100
Subject: add patch for 8.0 from   https://github.com/weltling/parle/pull/22

---
 php-pecl-parle.spec | 57 +++++++++++++++++++++++------------------------------
 1 file changed, 25 insertions(+), 32 deletions(-)

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

diff --git a/php-pecl-parle.spec b/php-pecl-parle.spec
index ae9a573..4ee63da 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-2019 Remi Collet
+# Copyright (c) 2017-2021 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -21,30 +21,32 @@
 # After json
 %global ini_name     40-%{pecl_name}.ini
 
-%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
-%global dtsprefix devtoolset-6-
-%endif
-
 Summary:        Parsing and lexing
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}
 Version:        0.8.1
-Release:        8%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:        9%{?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
+URL:            https://pecl.php.net/package/%{pecl_name}
+Source0:        https://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
+Patch2:         https://patch-diff.githubusercontent.com/raw/weltling/parle/pull/22.patch
 
-BuildRequires:  %{?scl_prefix}php-devel >= 7
-BuildRequires:  %{?scl_prefix}php-pear
-BuildRequires:  %{?scl_prefix}php-json
+BuildRequires:  make
+%if 0%{?rhel} == 7 && 0%{?dtsversion} == 0
+# Always use DTS as c++14 is required
+BuildRequires: devtoolset-8-toolchain
+%global dtsenable source /opt/rh/devtoolset-8/enable
+%global dtsprefix devtoolset-8-
+%endif
+BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?dtsprefix}gcc-c++
 BuildRequires:  %{?dtsprefix}libstdc++-devel
+BuildRequires:  %{?scl_prefix}php-devel >= 7.0
+BuildRequires:  %{?scl_prefix}php-pear
+BuildRequires:  %{?scl_prefix}php-json
 
 # bundled libraries
 Provides:       bundled(parsertl)
@@ -66,31 +68,16 @@ Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{rele
 
 Obsoletes:     %{name}-devel < %{version}
 
-%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
-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}
-%endif
-%if "%{php_version}" > "7.2"
-Obsoletes:     php72u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php72w-pecl-%{pecl_name} <= %{version}
-%endif
+%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
 %if "%{php_version}" > "7.3"
 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
+%if "%{php_version}" > "8.0"
+Obsoletes:     php80-pecl-%{pecl_name}  <= %{version}
 %endif
-
-%if 0%{?fedora} < 20 && 0%{?rhel} < 7
-# Filter shared private
-%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
-%{?filter_setup}
 %endif
 
 
@@ -122,6 +109,7 @@ mv NTS/lib/parsertl14/parsertl/licence_1_0.txt NTS/LICENSE.parsertl14
 cd NTS
 %patch0 -p1 -b .up
 %patch1 -p1 -b .pr17
+%patch2 -p1 -b .pr22
 
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_PARLE_VERSION/{s/.* "//;s/".*$//;p}' php_parle.h)
@@ -250,8 +238,13 @@ fi
 %{php_ztsextdir}/%{pecl_name}.so
 %endif
 
+######### TODO : use --enable-parle-utf32 ?
 
 %changelog
+* Fri Jan 15 2021 Remi Collet <remi@remirepo.net> - 0.8.1-9
+- add patch for 8.0 from
+  https://github.com/weltling/parle/pull/22
+
 * Tue Sep 03 2019 Remi Collet <remi@remirepo.net> - 0.8.1-8
 - rebuild for 7.4.0RC1
 
-- 
cgit