From 8608fc9c9a8a5d3de78d201d67d94789cb5c4800 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 26 Jun 2018 15:47:23 +0200
Subject: add patch for PHP 7.3 from
 https://github.com/cataphract/php-rar/pull/4

---
 php-pecl-rar.spec | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

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

diff --git a/php-pecl-rar.spec b/php-pecl-rar.spec
index e66426e..a72dfbe 100644
--- a/php-pecl-rar.spec
+++ b/php-pecl-rar.spec
@@ -1,6 +1,6 @@
 # spec file for php-pecl-rar
 #
-# Copyright (c) 2013-2017 Remi Collet
+# Copyright (c) 2013-2018 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -19,12 +19,14 @@
 Summary:        PHP extension for reading RAR archives
 Name:           %{?scl_prefix}php-pecl-%{pecl_name}
 Version:        4.0.0
-Release:        1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release:        2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 License:        PHP and Freeware with further limitations
 Group:          Development/Languages
 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/cataphract/php-rar/pull/4.patch
+
 BuildRequires:  %{?scl_prefix}php-devel
 BuildRequires:  %{?scl_prefix}php-pear
 
@@ -43,14 +45,6 @@ Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{rele
 
 %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
 # Other third party repo stuff
-Obsoletes:     php53-pecl-%{pecl_name}
-Obsoletes:     php53u-pecl-%{pecl_name}
-Obsoletes:     php54-pecl-%{pecl_name}
-Obsoletes:     php54w-pecl-%{pecl_name}
-%if "%{php_version}" > "5.5"
-Obsoletes:     php55u-pecl-%{pecl_name}
-Obsoletes:     php55w-pecl-%{pecl_name}
-%endif
 %if "%{php_version}" > "5.6"
 Obsoletes:     php56u-pecl-%{pecl_name}
 Obsoletes:     php56w-pecl-%{pecl_name}
@@ -94,6 +88,7 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd NTS
+%patch0 -p1 -b .pr4
 
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_RAR_VERSION/{s/.* "//;s/".*$//;p}' php_rar.h)
@@ -161,7 +156,7 @@ do
 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
@@ -182,12 +177,6 @@ fi
 
 
 %check
-%if "%{php_version}" > "7.2"
-# count issue - under investigation
-rm ?TS/tests/079.phpt
-rm ?TS/tests/092.phpt
-%endif
-
 : Minimal load test for NTS extension
 cd NTS
 %{_bindir}/php --no-php-ini \
@@ -233,6 +222,10 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Tue Jun 26 2018 Remi Collet <remi@remirepo.net> - 4.0.0-2
+- add patch for PHP 7.3 from
+  https://github.com/cataphract/php-rar/pull/4
+
 * Tue Aug  1 2017 Remi Collet <remi@remirepo.net> - 4.0.0-1
 - Update to 4.0.0
 
-- 
cgit