From 2793606279328e9699b07c305149d59e8e430d2d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 9 May 2022 07:52:40 +0200
Subject: update to 1.0.4

drop patch merged upstream
---
 4.patch               | 25 -------------------------
 PHPINFO               |  2 +-
 REFLECTION            |  2 +-
 php-pecl-excimer.spec | 12 ++++++------
 4 files changed, 8 insertions(+), 33 deletions(-)
 delete mode 100644 4.patch

diff --git a/4.patch b/4.patch
deleted file mode 100644
index 43cdfca..0000000
--- a/4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b87b859aa7546942f85e20c05e3aefa797868164 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Wed, 4 May 2022 16:22:00 +0200
-Subject: [PATCH] fix arginfo for 7.1
-
----
- excimer.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/excimer.c b/excimer.c
-index ac7e12f..fec499a 100644
---- a/excimer.c
-+++ b/excimer.c
-@@ -285,7 +285,11 @@ ZEND_END_ARG_INFO()
- ZEND_BEGIN_ARG_INFO(arginfo_ExcimerLog_formatCollapsed, 0)
- ZEND_END_ARG_INFO()
- 
-+#if PHP_VERSION_ID < 70200
-+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(arginfo_ExcimerLog_aggregateByFunction, IS_ARRAY, NULL, 0)
-+#else
- ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(arginfo_ExcimerLog_aggregateByFunction, IS_ARRAY, 0)
-+#endif
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO(arginfo_ExcimerLog_getEventCount, 0)
diff --git a/PHPINFO b/PHPINFO
index 50498f5..63cb350 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,4 +2,4 @@
 excimer
 
 excimer support => enabled
-excimer version => 1.0.3
+excimer version => 1.0.4
diff --git a/REFLECTION b/REFLECTION
index 4b87747..2837eae 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #73 excimer version 1.0.3 ] {
+Extension [ <persistent> extension #73 excimer version 1.0.4 ] {
 
   - Dependencies {
   }
diff --git a/php-pecl-excimer.spec b/php-pecl-excimer.spec
index 7096962..12b916a 100644
--- a/php-pecl-excimer.spec
+++ b/php-pecl-excimer.spec
@@ -1,6 +1,6 @@
 # spec file for php-pecl-excimer
 #
-# Copyright (c) 2021 Remi Collet
+# Copyright (c) 2021-2022 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -20,14 +20,12 @@
 
 Summary:        Interrupting timer and low-overhead sampling profiler
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}
-Version:        1.0.3
+Version:        1.0.4
 Release:        1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 License:        ASL 2.0
 URL:            https://pecl.php.net/package/%{pecl_name}
 Source0:        https://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 
-Patch0:         https://patch-diff.githubusercontent.com/raw/wikimedia/php-excimer/pull/4.patch
-
 BuildRequires:  make
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel >= 7.1
@@ -78,8 +76,6 @@ sed -e 's/role="test"/role="src"/' \
 mv %{pecl_name}-%{version} NTS
 
 cd NTS
-%patch0 -p1 -b .pr4
-
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_EXCIMER_VERSION/{s/.* "//;s/".*$//;p}' php_excimer.h)
 if test "x${extver}" != "x%{version}"; then
@@ -211,6 +207,10 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}/%{php_ztsextdir}/%{pecl_name}.so" \
 
 
 %changelog
+* Mon May  9 2022 Remi Collet <remi@remirepo.net> - 1.0.4-1
+- update to 1.0.4
+- drop patch merged upstream
+
 * Wed May  4 2022 Remi Collet <remi@remirepo.net> - 1.0.3-1
 - update to 1.0.3
 - fix build with PHP 7.1 using patch from
-- 
cgit