From bcca276d66d158f01412f2b2908f3f9d49e2d0fe Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 8 Oct 2020 08:01:29 +0200
Subject: update to 4.0.0a1 raise dependency on PHP 7.2

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

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

diff --git a/php-pecl-runkit7.spec b/php-pecl-runkit7.spec
index 6b4b334..f60a4d7 100644
--- a/php-pecl-runkit7.spec
+++ b/php-pecl-runkit7.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-pecl-runkit7
 #
-# Copyright (c) 2019 Remi Collet
+# Copyright (c) 2019-2020 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -20,8 +20,8 @@
 %global ini_name  40-%{pecl_name}.ini
 %global with_tests 0%{!?_without_tests:1}
 
-%global upstream_version 3.0.0
-#global upstream_prever  RC1
+%global upstream_version 4.0.0
+%global upstream_prever  a1
 
 Name:           %{?sub_prefix}php-pecl-%{proj_name}
 Summary:        For all those things you... shouldn't have been doing anyway... but surely do!
@@ -32,8 +32,10 @@ URL:            https://pecl.php.net/package/%{proj_name}
 
 Source0:        https://pecl.php.net/get/%{proj_name}-%{upstream_version}%{?upstream_prever}.tgz
 
+Source1:        https://raw.githubusercontent.com/runkit7/runkit7/master/runkit7_arginfo.h
+
 BuildRequires:  %{?dtsprefix}gcc
-BuildRequires:  %{?scl_prefix}php-devel >= 7.1
+BuildRequires:  %{?scl_prefix}php-devel >= 7.2
 BuildRequires:  %{?scl_prefix}php-pear
 #BuildRequires:  gdb
 #BuildRequires:  php-cli-debuginfo
@@ -53,21 +55,16 @@ Provides:       %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
 Provides:       %{?scl_prefix}php-%{pecl_name}               = %{version}
 Provides:       %{?scl_prefix}php-%{pecl_name}%{?_isa}       = %{version}
 
-%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
+%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
 # Other third party repo stuff
-Obsoletes:     php71u-pecl-%{proj_name} <= %{version}
-Obsoletes:     php71w-pecl-%{proj_name} <= %{version}
-%if "%{php_version}" > "7.2"
-Obsoletes:     php72u-pecl-%{proj_name} <= %{version}
-Obsoletes:     php72w-pecl-%{proj_name} <= %{version}
-%endif
 %if "%{php_version}" > "7.3"
-Obsoletes:     php73-pecl-%{proj_name}  <= %{version}
-Obsoletes:     php73w-pecl-%{proj_name} <= %{version}
+Obsoletes:      php73-pecl-%{proj_name} <= %{version}
 %endif
 %if "%{php_version}" > "7.4"
-Obsoletes:     php74-pecl-%{proj_name}  <= %{version}
-Obsoletes:     php74w-pecl-%{proj_name} <= %{version}
+Obsoletes:      php74-pecl-%{proj_name} <= %{version}
+%endif
+%if "%{php_version}" > "8.0"
+Obsoletes:      php80-pecl-%{proj_name} <= %{version}
 %endif
 %endif
 
@@ -95,6 +92,8 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd NTS
+cp %{SOURCE1} .
+
 extver=$(sed -n '/#define PHP_RUNKIT7_VERSION/{s/.*\t"//;s/".*$//;p}' runkit.h)
 if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}%{?gh_date:dev}"; then
    : Error: Upstream RUNKIT version is now ${extver}, expecting %{upstream_version}%{?upstream_prever}%{?gh_date:dev}.
@@ -175,8 +174,12 @@ export REPORT_EXIT_STATUS=1
 %if %{with_tests}
 # ignore FPM tests because of systemd monitoring changing output
 rm ?TS/tests/runkit_fpm*
-# segfault on 32-bit see https://github.com/runkit7/runkit7/issues/185
-rm ?TS/tests/runkit_import_class_extend.phpt
+%if "%{php_version}" > "8.0"
+rm ?TS/tests/runkit_arginfo.phpt
+rm ?TS/tests/runkit_function_copy_8.phpt
+rm ?TS/tests/runkit_method_variadic_strict.phpt
+rm ?TS/tests/runkit_methods_returning_by_reference.phpt
+%endif
 
 : Upstream test suite NTS extension
 cd NTS
@@ -235,6 +238,13 @@ fi
 %endif
 
 %changelog
+* Thu Oct  8 2020 Remi Collet <remi@remirepo.net> - 4.0.0~a1-1
+- update to 4.0.0a1
+- raise dependency on PHP 7.2
+
+* Thu Jan  2 2020 Remi Collet <remi@remirepo.net> - 3.1.0~a1-1
+- update to 3.1.0a1
+
 * Mon Jun 17 2019 Remi Collet <remi@remirepo.net> - 3.0.0-1
 - update to 3.0.0
 
-- 
cgit