update to 3.0.0RC2

3 files changed, 73 insertions, 91 deletions

diff --git a/PHPINFO b/PHPINFO
index 76bfb3d..96301b7 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -3,4 +3,4 @@ eio
 
 eio support => enabled
 Debug support => disabled
-Version => 2.0.4
+Version => 3.0.0RC2
diff --git a/REFLECTION b/REFLECTION
index d675b6c..75969e9 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,63 +1,63 @@
-Extension [ <persistent> extension #85 eio version 2.0.4 ] {
+Extension [ <persistent> extension #120 eio version 3.0.0RC2 ] {
 
   - Dependencies {
     Dependency [ sockets (Optional) ]
   }
 
   - Constants [53] {
-    Constant [ integer EIO_SEEK_SET ] { 0 }
-    Constant [ integer EIO_SEEK_CUR ] { 1 }
-    Constant [ integer EIO_SEEK_END ] { 2 }
-    Constant [ integer EIO_PRI_MIN ] { -4 }
-    Constant [ integer EIO_PRI_DEFAULT ] { 0 }
-    Constant [ integer EIO_PRI_MAX ] { 4 }
-    Constant [ integer EIO_READDIR_DENTS ] { 1 }
-    Constant [ integer EIO_READDIR_DIRS_FIRST ] { 2 }
-    Constant [ integer EIO_READDIR_STAT_ORDER ] { 4 }
-    Constant [ integer EIO_READDIR_FOUND_UNKNOWN ] { 128 }
-    Constant [ integer EIO_DT_UNKNOWN ] { 0 }
-    Constant [ integer EIO_DT_FIFO ] { 1 }
-    Constant [ integer EIO_DT_CHR ] { 2 }
-    Constant [ integer EIO_DT_MPC ] { 3 }
-    Constant [ integer EIO_DT_DIR ] { 4 }
-    Constant [ integer EIO_DT_NAM ] { 5 }
-    Constant [ integer EIO_DT_BLK ] { 6 }
-    Constant [ integer EIO_DT_MPB ] { 7 }
-    Constant [ integer EIO_DT_REG ] { 8 }
-    Constant [ integer EIO_DT_NWK ] { 9 }
-    Constant [ integer EIO_DT_CMP ] { 9 }
-    Constant [ integer EIO_DT_LNK ] { 10 }
-    Constant [ integer EIO_DT_SOCK ] { 12 }
-    Constant [ integer EIO_DT_DOOR ] { 13 }
-    Constant [ integer EIO_DT_WHT ] { 14 }
-    Constant [ integer EIO_DT_MAX ] { 15 }
-    Constant [ integer EIO_O_RDONLY ] { 0 }
-    Constant [ integer EIO_O_WRONLY ] { 1 }
-    Constant [ integer EIO_O_RDWR ] { 2 }
-    Constant [ integer EIO_O_NONBLOCK ] { 2048 }
-    Constant [ integer EIO_O_APPEND ] { 1024 }
-    Constant [ integer EIO_O_CREAT ] { 64 }
-    Constant [ integer EIO_O_TRUNC ] { 512 }
-    Constant [ integer EIO_O_EXCL ] { 128 }
-    Constant [ integer EIO_O_FSYNC ] { 1052672 }
-    Constant [ integer EIO_S_IRUSR ] { 256 }
-    Constant [ integer EIO_S_IWUSR ] { 128 }
-    Constant [ integer EIO_S_IXUSR ] { 64 }
-    Constant [ integer EIO_S_IRGRP ] { 32 }
-    Constant [ integer EIO_S_IWGRP ] { 16 }
-    Constant [ integer EIO_S_IXGRP ] { 8 }
-    Constant [ integer EIO_S_IROTH ] { 4 }
-    Constant [ integer EIO_S_IWOTH ] { 2 }
-    Constant [ integer EIO_S_IXOTH ] { 1 }
-    Constant [ integer EIO_S_IFREG ] { 32768 }
-    Constant [ integer EIO_S_IFCHR ] { 8192 }
-    Constant [ integer EIO_S_IFBLK ] { 24576 }
-    Constant [ integer EIO_S_IFIFO ] { 4096 }
-    Constant [ integer EIO_S_IFSOCK ] { 49152 }
-    Constant [ integer EIO_SYNC_FILE_RANGE_WAIT_BEFORE ] { 1 }
-    Constant [ integer EIO_SYNC_FILE_RANGE_WRITE ] { 2 }
-    Constant [ integer EIO_SYNC_FILE_RANGE_WAIT_AFTER ] { 4 }
-    Constant [ integer EIO_FALLOC_FL_KEEP_SIZE ] { 1 }
+    Constant [ int EIO_SEEK_SET ] { 0 }
+    Constant [ int EIO_SEEK_CUR ] { 1 }
+    Constant [ int EIO_SEEK_END ] { 2 }
+    Constant [ int EIO_PRI_MIN ] { -4 }
+    Constant [ int EIO_PRI_DEFAULT ] { 0 }
+    Constant [ int EIO_PRI_MAX ] { 4 }
+    Constant [ int EIO_READDIR_DENTS ] { 1 }
+    Constant [ int EIO_READDIR_DIRS_FIRST ] { 2 }
+    Constant [ int EIO_READDIR_STAT_ORDER ] { 4 }
+    Constant [ int EIO_READDIR_FOUND_UNKNOWN ] { 128 }
+    Constant [ int EIO_DT_UNKNOWN ] { 0 }
+    Constant [ int EIO_DT_FIFO ] { 1 }
+    Constant [ int EIO_DT_CHR ] { 2 }
+    Constant [ int EIO_DT_MPC ] { 3 }
+    Constant [ int EIO_DT_DIR ] { 4 }
+    Constant [ int EIO_DT_NAM ] { 5 }
+    Constant [ int EIO_DT_BLK ] { 6 }
+    Constant [ int EIO_DT_MPB ] { 7 }
+    Constant [ int EIO_DT_REG ] { 8 }
+    Constant [ int EIO_DT_NWK ] { 9 }
+    Constant [ int EIO_DT_CMP ] { 9 }
+    Constant [ int EIO_DT_LNK ] { 10 }
+    Constant [ int EIO_DT_SOCK ] { 12 }
+    Constant [ int EIO_DT_DOOR ] { 13 }
+    Constant [ int EIO_DT_WHT ] { 14 }
+    Constant [ int EIO_DT_MAX ] { 15 }
+    Constant [ int EIO_O_RDONLY ] { 0 }
+    Constant [ int EIO_O_WRONLY ] { 1 }
+    Constant [ int EIO_O_RDWR ] { 2 }
+    Constant [ int EIO_O_NONBLOCK ] { 2048 }
+    Constant [ int EIO_O_APPEND ] { 1024 }
+    Constant [ int EIO_O_CREAT ] { 64 }
+    Constant [ int EIO_O_TRUNC ] { 512 }
+    Constant [ int EIO_O_EXCL ] { 128 }
+    Constant [ int EIO_O_FSYNC ] { 1052672 }
+    Constant [ int EIO_S_IRUSR ] { 256 }
+    Constant [ int EIO_S_IWUSR ] { 128 }
+    Constant [ int EIO_S_IXUSR ] { 64 }
+    Constant [ int EIO_S_IRGRP ] { 32 }
+    Constant [ int EIO_S_IWGRP ] { 16 }
+    Constant [ int EIO_S_IXGRP ] { 8 }
+    Constant [ int EIO_S_IROTH ] { 4 }
+    Constant [ int EIO_S_IWOTH ] { 2 }
+    Constant [ int EIO_S_IXOTH ] { 1 }
+    Constant [ int EIO_S_IFREG ] { 32768 }
+    Constant [ int EIO_S_IFCHR ] { 8192 }
+    Constant [ int EIO_S_IFBLK ] { 24576 }
+    Constant [ int EIO_S_IFIFO ] { 4096 }
+    Constant [ int EIO_S_IFSOCK ] { 49152 }
+    Constant [ int EIO_SYNC_FILE_RANGE_WAIT_BEFORE ] { 1 }
+    Constant [ int EIO_SYNC_FILE_RANGE_WRITE ] { 2 }
+    Constant [ int EIO_SYNC_FILE_RANGE_WAIT_AFTER ] { 4 }
+    Constant [ int EIO_FALLOC_FL_KEEP_SIZE ] { 1 }
   }
 
   - Functions {
diff --git a/php-pecl-eio.spec b/php-pecl-eio.spec
index 0fb3ca6..f554624 100644
--- a/php-pecl-eio.spec
+++ b/php-pecl-eio.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-pecl-eio
 #
-# Copyright (c) 2013-2019 Remi Collet
+# Copyright (c) 2013-2021 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -20,7 +20,9 @@
 # After 20-sockets
 %global ini_name  40-%{pecl_name}.ini
 %endif
-#global prever     RC3
+
+%global upstream_version 3.0.0
+%global upstream_prever  RC2
 
 #
 # NOTE: bundled libeio (which is retired from Fedora)
@@ -28,12 +30,13 @@
 
 Summary:        Provides interface to the libeio library
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}
-Version:        2.0.4
-Release:        5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
+Release:        1%{?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
+URL:            https://pecl.php.net/package/%{pecl_name}
+Source0:        https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
 
+BuildRequires:  make
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel
 BuildRequires:  %{?scl_prefix}php-pear
@@ -61,38 +64,17 @@ Provides:       %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release}
 Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release}
 %endif
 
-%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
+%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
 # Other third party repo stuff
-%if "%{php_version}" > "5.6"
-Obsoletes:     php56u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php56w-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "7.0"
-Obsoletes:     php70u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php70w-pecl-%{pecl_name} <= %{version}
-%endif
-%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 "%{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 private shared object
-%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
-%{?filter_setup}
 %endif
 
 
@@ -111,7 +93,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 
 %prep
 %setup -q -c
-mv %{pecl_name}-%{version}%{?prever} NTS
+mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS
 
 # Don't install/register tests
 sed -e 's/role="test"/role="src"/' \
@@ -121,8 +103,8 @@ sed -e 's/role="test"/role="src"/' \
 cd NTS
 # 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
-   : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever}.
+if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
+   : Error: Upstream version is ${extver}, expecting %{upstream_version}%{?upstream_prever}.
    exit 1
 fi
 cd ..
@@ -208,9 +190,6 @@ fi
 %check
 # Need investigation (output order, erratic results)
 rm  ?TS/tests/eio_custom_basic.phpt
-%if 0%{?rhel} == 5
-rm  ?TS/tests/eio_fallocate_basic.phpt
-%endif
 
 DEPMOD=
 [ -f %{php_extdir}/sockets.so ] && DEPMOD="$DEPMOD -d extension=sockets.so"
@@ -263,6 +242,9 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Mon Apr 19 2021 Remi Collet <remi@remirepo.net> - 3.0.0~RC2-1
+- update to 3.0.0RC2
+
 * Tue Sep 03 2019 Remi Collet <remi@remirepo.net> - 2.0.4-5
 - rebuild for 7.4.0RC1