summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--8.patch23
-rw-r--r--REFLECTION2
-rw-r--r--php-pecl-eio.spec21
3 files changed, 15 insertions, 31 deletions
diff --git a/8.patch b/8.patch
deleted file mode 100644
index 20cd623..0000000
--- a/8.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 5fba157143601ac723bba4a39fd92789550c375b Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Tue, 26 Jun 2018 08:26:14 +0200
-Subject: [PATCH] fix for PHP 7.3
-
----
- php7/php_eio.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/php7/php_eio.c b/php7/php_eio.c
-index 991ed49..1197898 100644
---- a/php7/php_eio.c
-+++ b/php7/php_eio.c
-@@ -161,7 +161,9 @@ static zval * php_eio_call_method(zval *object, zend_class_entry *obj_ce, zend_f
- } else {
- zend_fcall_info_cache fcic;
-
-+#if PHP_VERSION_ID < 70300
- fcic.initialized = 1;
-+#endif
- if (!obj_ce) {
- obj_ce = object ? Z_OBJCE_P(object) : NULL;
- }
diff --git a/REFLECTION b/REFLECTION
index 1f3e93f..14e920a 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #82 eio version 2.0.2 ] {
+Extension [ <persistent> extension #85 eio version 2.0.3 ] {
- Dependencies {
Dependency [ sockets (Optional) ]
diff --git a/php-pecl-eio.spec b/php-pecl-eio.spec
index 3be95f3..8e7b34f 100644
--- a/php-pecl-eio.spec
+++ b/php-pecl-eio.spec
@@ -27,16 +27,14 @@
Summary: Provides interface to the libeio library
Name: %{?sub_prefix}php-pecl-%{pecl_name}
-Version: 2.0.2
-Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version: 2.0.3
+Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: PHP
URL: http://pecl.php.net/package/%{pecl_name}
Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
-Patch0: https://patch-diff.githubusercontent.com/raw/rosmanov/pecl-eio/pull/8.patch
-
BuildRequires: %{?dtsprefix}gcc
-BuildRequires: %{?scl_prefix}php-devel > 5.3
+BuildRequires: %{?scl_prefix}php-devel
BuildRequires: %{?scl_prefix}php-pear
BuildRequires: %{?scl_prefix}php-sockets
# For tests
@@ -80,6 +78,10 @@ Obsoletes: php71w-pecl-%{pecl_name} <= %{version}
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: php73w-pecl-%{pecl_name} <= %{version}
+%endif
%endif
%if 0%{?fedora} < 20 && 0%{?rhel} < 7
@@ -112,8 +114,6 @@ sed -e 's/role="test"/role="src"/' \
-i package.xml
cd NTS
-%patch0 -p1 -b .pr8
-
# Sanity check, really often broken
extver=$(sed -n '/define PHP_EIO_VERSION/{s/.* "//;s/".*$//;p}' php%(%{__php} -r 'echo PHP_MAJOR_VERSION;')/php_eio.h)
if test "x${extver}" != "x%{version}%{?prever}"; then
@@ -258,6 +258,13 @@ REPORT_EXIT_STATUS=1 \
%changelog
+* Wed Jul 18 2018 Remi Collet <remi@remirepo.net> - 2.0.3-2
+- rebuld for 7.3.0alpha4 new ABI
+
+* Tue Jun 26 2018 Remi Collet <remi@remirepo.net> - 2.0.3-1
+- update to 2.0.3
+- drop patch merged upstream
+
* Tue Jun 26 2018 Remi Collet <remi@remirepo.net> - 2.0.2-4
- add patch for PHP 7.3 from
https://github.com/rosmanov/pecl-eio/pull/8