From a9d5936105bf449e8170b1ce7fd0cc579df4beff Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 8 Jun 2016 16:50:46 +0200 Subject: php-pecl-eio: switch the spec --- REFLECTION | 2 +- REFLECTION-DEV | 570 -------------------------------------------------- php-pecl-eio-dev.spec | 310 --------------------------- php-pecl-eio.spec | 82 +++++--- 4 files changed, 53 insertions(+), 911 deletions(-) delete mode 100644 REFLECTION-DEV delete mode 100644 php-pecl-eio-dev.spec diff --git a/REFLECTION b/REFLECTION index de371f0..48c1d94 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #89 eio version 1.2.6 ] { +Extension [ extension #89 eio version 2.0.0RC3 ] { - Dependencies { Dependency [ sockets (Optional) ] diff --git a/REFLECTION-DEV b/REFLECTION-DEV deleted file mode 100644 index 48c1d94..0000000 --- a/REFLECTION-DEV +++ /dev/null @@ -1,570 +0,0 @@ -Extension [ extension #89 eio version 2.0.0RC3 ] { - - - 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 } - } - - - Functions { - Function [ function eio_init ] { - - - Parameters [0] { - } - } - Function [ function eio_poll ] { - - - Parameters [0] { - } - } - Function [ function eio_event_loop ] { - - - Parameters [0] { - } - } - Function [ function eio_get_last_error ] { - - - Parameters [1] { - Parameter #0 [ $req ] - } - } - Function [ function eio_open ] { - - - Parameters [6] { - Parameter #0 [ $path ] - Parameter #1 [ $flags ] - Parameter #2 [ $mode ] - Parameter #3 [ $pri ] - Parameter #4 [ $callback ] - Parameter #5 [ $data ] - } - } - Function [ function eio_truncate ] { - - - Parameters [5] { - Parameter #0 [ $path ] - Parameter #1 [ $offset ] - Parameter #2 [ $pri ] - Parameter #3 [ $callback ] - Parameter #4 [ $data ] - } - } - Function [ function eio_chown ] { - - - Parameters [6] { - Parameter #0 [ $path ] - Parameter #1 [ $uid ] - Parameter #2 [ $gid ] - Parameter #3 [ $pri ] - Parameter #4 [ $callback ] - Parameter #5 [ $data ] - } - } - Function [ function eio_chmod ] { - - - Parameters [5] { - Parameter #0 [ $path ] - Parameter #1 [ $mode ] - Parameter #2 [ $pri ] - Parameter #3 [ $callback ] - Parameter #4 [ $data ] - } - } - Function [ function eio_mkdir ] { - - - Parameters [5] { - Parameter #0 [ $path ] - Parameter #1 [ $mode ] - Parameter #2 [ $pri ] - Parameter #3 [ $callback ] - Parameter #4 [ $data ] - } - } - Function [ function eio_rmdir ] { - - - Parameters [4] { - Parameter #0 [ $path ] - Parameter #1 [ $pri ] - Parameter #2 [ $callback ] - Parameter #3 [ $data ] - } - } - Function [ function eio_unlink ] { - - - Parameters [4] { - Parameter #0 [ $path ] - Parameter #1 [ $pri ] - Parameter #2 [ $callback ] - Parameter #3 [ $data ] - } - } - Function [ function eio_utime ] { - - - Parameters [6] { - Parameter #0 [ $path ] - Parameter #1 [ $atime ] - Parameter #2 [ $mtime ] - Parameter #3 [ $pri ] - Parameter #4 [ $callback ] - Parameter #5 [ $data ] - } - } - Function [ function eio_mknod ] { - - - Parameters [6] { - Parameter #0 [ $path ] - Parameter #1 [ $mode ] - Parameter #2 [ $dev ] - Parameter #3 [ $pri ] - Parameter #4 [ $callback ] - Parameter #5 [ $data ] - } - } - Function [ function eio_link ] { - - - Parameters [5] { - Parameter #0 [ $path ] - Parameter #1 [ $new_path ] - Parameter #2 [ $pri ] - Parameter #3 [ $callback ] - Parameter #4 [ $data ] - } - } - Function [ function eio_symlink ] { - - - Parameters [5] { - Parameter #0 [ $path ] - Parameter #1 [ $new_path ] - Parameter #2 [ $pri ] - Parameter #3 [ $callback ] - Parameter #4 [ $data ] - } - } - Function [ function eio_rename ] { - - - Parameters [5] { - Parameter #0 [ $path ] - Parameter #1 [ $new_path ] - Parameter #2 [ $pri ] - Parameter #3 [ $callback ] - Parameter #4 [ $data ] - } - } - Function [ function eio_close ] { - - - Parameters [4] { - Parameter #0 [ $fd ] - Parameter #1 [ $pri ] - Parameter #2 [ $callback ] - Parameter #3 [ $data ] - } - } - Function [ function eio_sync ] { - - - Parameters [0] { - } - } - Function [ function eio_fsync ] { - - - Parameters [4] { - Parameter #0 [ $fd ] - Parameter #1 [ $pri ] - Parameter #2 [ $callback ] - Parameter #3 [ $data ] - } - } - Function [ function eio_fdatasync ] { - - - Parameters [4] { - Parameter #0 [ $fd ] - Parameter #1 [ $pri ] - Parameter #2 [ $callback ] - Parameter #3 [ $data ] - } - } - Function [ function eio_futime ] { - - - Parameters [6] { - Parameter #0 [ $fd ] - Parameter #1 [ $atime ] - Parameter #2 [ $mtime ] - Parameter #3 [ $pri ] - Parameter #4 [ $callback ] - Parameter #5 [ $data ] - } - } - Function [ function eio_ftruncate ] { - - - Parameters [5] { - Parameter #0 [ $fd ] - Parameter #1 [ $offset ] - Parameter #2 [ $pri ] - Parameter #3 [ $callback ] - Parameter #4 [ $data ] - } - } - Function [ function eio_fchmod ] { - - - Parameters [5] { - Parameter #0 [ $fd ] - Parameter #1 [ $mode ] - Parameter #2 [ $pri ] - Parameter #3 [ $callback ] - Parameter #4 [ $data ] - } - } - Function [ function eio_fchown ] { - - - Parameters [6] { - Parameter #0 [ $fd ] - Parameter #1 [ $uid ] - Parameter #2 [ $gid ] - Parameter #3 [ $pri ] - Parameter #4 [ $callback ] - Parameter #5 [ $data ] - } - } - Function [ function eio_dup2 ] { - - - Parameters [5] { - Parameter #0 [ $fd ] - Parameter #1 [ $fd2 ] - Parameter #2 [ $pri ] - Parameter #3 [ $callback ] - Parameter #4 [ $data ] - } - } - Function [ function eio_read ] { - - - Parameters [6] { - Parameter #0 [ $fd ] - Parameter #1 [ $length ] - Parameter #2 [ $offset ] - Parameter #3 [ $pri ] - Parameter #4 [ $callback ] - Parameter #5 [ $data ] - } - } - Function [ function eio_write ] { - - - Parameters [7] { - Parameter #0 [ $fd ] - Parameter #1 [ $str ] - Parameter #2 [ $length ] - Parameter #3 [ $offset ] - Parameter #4 [ $pri ] - Parameter #5 [ $callback ] - Parameter #6 [ $data ] - } - } - Function [ function eio_readlink ] { - - - Parameters [4] { - Parameter #0 [ $path ] - Parameter #1 [ $pri ] - Parameter #2 [ $callback ] - Parameter #3 [ $data ] - } - } - Function [ function eio_realpath ] { - - - Parameters [4] { - Parameter #0 [ $path ] - Parameter #1 [ $pri ] - Parameter #2 [ $callback ] - Parameter #3 [ $data ] - } - } - Function [ function eio_stat ] { - - - Parameters [4] { - Parameter #0 [ $path ] - Parameter #1 [ $pri ] - Parameter #2 [ $callback ] - Parameter #3 [ $data ] - } - } - Function [ function eio_lstat ] { - - - Parameters [4] { - Parameter #0 [ $path ] - Parameter #1 [ $pri ] - Parameter #2 [ $callback ] - Parameter #3 [ $data ] - } - } - Function [ function eio_fstat ] { - - - Parameters [4] { - Parameter #0 [ $fd ] - Parameter #1 [ $pri ] - Parameter #2 [ $callback ] - Parameter #3 [ $data ] - } - } - Function [ function eio_statvfs ] { - - - Parameters [4] { - Parameter #0 [ $path ] - Parameter #1 [ $pri ] - Parameter #2 [ $callback ] - Parameter #3 [ $data ] - } - } - Function [ function eio_fstatvfs ] { - - - Parameters [4] { - Parameter #0 [ $fd ] - Parameter #1 [ $pri ] - Parameter #2 [ $callback ] - Parameter #3 [ $data ] - } - } - Function [ function eio_readdir ] { - - - Parameters [5] { - Parameter #0 [ $path ] - Parameter #1 [ $flags ] - Parameter #2 [ $pri ] - Parameter #3 [ $callback ] - Parameter #4 [ $data ] - } - } - Function [ function eio_sendfile ] { - - - Parameters [7] { - Parameter #0 [ $out_fd ] - Parameter #1 [ $in_fd ] - Parameter #2 [ $offset ] - Parameter #3 [ $length ] - Parameter #4 [ $pri ] - Parameter #5 [ $callback ] - Parameter #6 [ $data ] - } - } - Function [ function eio_readahead ] { - - - Parameters [6] { - Parameter #0 [ $fd ] - Parameter #1 [ $offset ] - Parameter #2 [ $length ] - Parameter #3 [ $pri ] - Parameter #4 [ $callback ] - Parameter #5 [ $data ] - } - } - Function [ function eio_seek ] { - - - Parameters [6] { - Parameter #0 [ $fd ] - Parameter #1 [ $offset ] - Parameter #2 [ $whence ] - Parameter #3 [ $pri ] - Parameter #4 [ $callback ] - Parameter #5 [ $data ] - } - } - Function [ function eio_syncfs ] { - - - Parameters [4] { - Parameter #0 [ $fd ] - Parameter #1 [ $pri ] - Parameter #2 [ $callback ] - Parameter #3 [ $data ] - } - } - Function [ function eio_sync_file_range ] { - - - Parameters [7] { - Parameter #0 [ $fd ] - Parameter #1 [ $offset ] - Parameter #2 [ $nbytes ] - Parameter #3 [ $flags ] - Parameter #4 [ $pri ] - Parameter #5 [ $callback ] - Parameter #6 [ $data ] - } - } - Function [ function eio_fallocate ] { - - - Parameters [7] { - Parameter #0 [ $fd ] - Parameter #1 [ $mode ] - Parameter #2 [ $offset ] - Parameter #3 [ $length ] - Parameter #4 [ $pri ] - Parameter #5 [ $callback ] - Parameter #6 [ $data ] - } - } - Function [ function eio_custom ] { - - - Parameters [4] { - Parameter #0 [ $execute ] - Parameter #1 [ $pri ] - Parameter #2 [ $callback ] - Parameter #3 [ $data ] - } - } - Function [ function eio_busy ] { - - - Parameters [4] { - Parameter #0 [ $delay ] - Parameter #1 [ $pri ] - Parameter #2 [ $callback ] - Parameter #3 [ $data ] - } - } - Function [ function eio_nop ] { - - - Parameters [3] { - Parameter #0 [ $pri ] - Parameter #1 [ $callback ] - Parameter #2 [ $data ] - } - } - Function [ function eio_cancel ] { - - - Parameters [1] { - Parameter #0 [ $req ] - } - } - Function [ function eio_grp ] { - - - Parameters [2] { - Parameter #0 [ $callback ] - Parameter #1 [ $data ] - } - } - Function [ function eio_grp_add ] { - - - Parameters [2] { - Parameter #0 [ $grp ] - Parameter #1 [ $req ] - } - } - Function [ function eio_grp_cancel ] { - - - Parameters [1] { - Parameter #0 [ $grp ] - } - } - Function [ function eio_grp_limit ] { - - - Parameters [2] { - Parameter #0 [ $grp ] - Parameter #1 [ $limit ] - } - } - Function [ function eio_set_max_poll_time ] { - - - Parameters [1] { - Parameter #0 [ $nseconds ] - } - } - Function [ function eio_set_max_poll_reqs ] { - - - Parameters [1] { - Parameter #0 [ $nreqs ] - } - } - Function [ function eio_set_min_parallel ] { - - - Parameters [1] { - Parameter #0 [ $nthreads ] - } - } - Function [ function eio_set_max_parallel ] { - - - Parameters [1] { - Parameter #0 [ $nthreads ] - } - } - Function [ function eio_set_max_idle ] { - - - Parameters [1] { - Parameter #0 [ $nthreads ] - } - } - Function [ function eio_nthreads ] { - - - Parameters [0] { - } - } - Function [ function eio_nreqs ] { - - - Parameters [0] { - } - } - Function [ function eio_nready ] { - - - Parameters [0] { - } - } - Function [ function eio_npending ] { - - - Parameters [0] { - } - } - Function [ function eio_get_event_stream ] { - - - Parameters [0] { - } - } - } -} - diff --git a/php-pecl-eio-dev.spec b/php-pecl-eio-dev.spec deleted file mode 100644 index e5bac7a..0000000 --- a/php-pecl-eio-dev.spec +++ /dev/null @@ -1,310 +0,0 @@ -# remirepo spec file for php-pecl-eio -# -# Copyright (c) 2013-2016 Remi Collet -# License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/4.0/ -# -# Please, preserve the changelog entries -# -%global pecl_name eio -%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} -%if "%{php_version}" < "5.6" -# After sockets -%global ini_name z-%{pecl_name}.ini -%else -# After 20-sockets -%global ini_name 40-%{pecl_name}.ini -%endif -%if 0%{?scl:1} -%if "%{scl}" == "rh-php56" -%global sub_prefix more-php56- -Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} -Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} -%else -%global sub_prefix %{scl_prefix} -%endif -%endif -%global prever RC3 - -%{?scl: %scl_package php-pecl-eio} - -# -# NOTE: bundled libeio (which is retired from Fedora) -# - -Summary: Provides interface to the libeio library -Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 2.0.0 -Release: 0.4.%{prever}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} -License: PHP -Group: Development/Languages -URL: http://pecl.php.net/package/%{pecl_name} -Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: %{?scl_prefix}php-devel > 5.3 -BuildRequires: %{?scl_prefix}php-pear -BuildRequires: %{?scl_prefix}php-sockets -# For tests -BuildRequires: %{?scl_prefix}php-posix - -Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} -Requires: %{?scl_prefix}php(api) = %{php_core_api} -%if "%{php_version}" < "5.4" -# php 5.3.3 in EL-6 don't use arched virtual provides -# so only requires real packages instead -Requires: %{?scl_prefix}php-common%{?_isa} -%else -Requires: %{?scl_prefix}php-sockets%{?_isa} -%endif -%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} - -Provides: %{?scl_prefix}php-%{pecl_name} = %{version} -Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} -Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} -Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} -%if "%{?scl_prefix}" != "%{?sub_prefix}" -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} -# Other third party repo stuff -Obsoletes: php53-pecl-%{pecl_name} <= %{version} -Obsoletes: php53u-pecl-%{pecl_name} <= %{version} -Obsoletes: php54-pecl-%{pecl_name} <= %{version} -Obsoletes: php54w-pecl-%{pecl_name} <= %{version} -%if "%{php_version}" > "5.5" -Obsoletes: php55u-pecl-%{pecl_name} <= %{version} -Obsoletes: php55w-pecl-%{pecl_name} <= %{version} -%endif -%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 -%endif - -%if 0%{?fedora} < 20 && 0%{?rhel} < 7 -# Filter private shared object -%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} -%{?filter_setup} -%endif - - -%description -This extension provides interface to the libeio library written by Marc Lehmann -(see http://software.schmorp.de/pkg/libeio.html). - -Libeio is a an asynchronous I/O library. Features basically include -asynchronous versions of POSIX API(read, write, open, close, stat, unlink, -fdatasync, mknod, readdir etc.); sendfile (native on Solaris, Linux, HP-UX, -FreeBSD); readahead. libeio itself emulates the system calls, if they are not -available on specific(UNIX-like) platform. - -Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}. - - -%prep -%setup -q -c -mv %{pecl_name}-%{version}%{?prever} NTS - -# Don't install/register tests -sed -e 's/role="test"/role="src"/' \ - %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ - -i package.xml - -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}. - exit 1 -fi -cd .. - -%if %{with_zts} -# Duplicate source tree for NTS / ZTS build -cp -pr NTS ZTS -%endif - -# Create configuration file -cat > %{ini_name} << 'EOF' -; Enable %{pecl_name} extension module -extension=%{pecl_name}.so -EOF - - -%build -cd NTS -%{_bindir}/phpize -%configure \ - --with-libdir=%{_lib} \ - --with-php-config=%{_bindir}/php-config - -make %{?_smp_mflags} - -%if %{with_zts} -cd ../ZTS -%{_bindir}/zts-phpize -%configure \ - --with-libdir=%{_lib} \ - --with-php-config=%{_bindir}/zts-php-config - -make %{?_smp_mflags} -%endif - - -%install -rm -rf %{buildroot} - -make -C NTS install INSTALL_ROOT=%{buildroot} - -# install config file - z-eio.ini to ensure load order (after sockets) -install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} - -# Install XML package description -install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml - -%if %{with_zts} -make -C ZTS install INSTALL_ROOT=%{buildroot} - -install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} -%endif - -# Documentation -cd NTS -for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//') -do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i -done - - -%if 0%{?fedora} < 24 -# when pear installed alone, after us -%triggerin -- %{?scl_prefix}php-pear -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -# posttrans as pear can be installed after us -%posttrans -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -%postun -if [ $1 -eq 0 -a -x %{__pecl} ] ; then - %{pecl_uninstall} %{pecl_name} >/dev/null || : -fi -%endif - - -%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" -[ -f %{php_extdir}/posix.so ] && DEPMOD="$DEPMOD -d extension=posix.so" - -: Minimal load test for NTS extension -cd NTS -%{_bindir}/php --no-php-ini \ - $DEPMOD \ - --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ - --modules | grep %{pecl_name} - -: Upstream test suite for NTS extension -TEST_PHP_EXECUTABLE=%{_bindir}/php \ -TEST_PHP_ARGS="-n $DEPMOD -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ -NO_INTERACTION=1 \ -REPORT_EXIT_STATUS=1 \ -%{_bindir}/php -n run-tests.php --show-diff - - -%if %{with_zts} -: Minimal load test for ZTS extension -cd ../ZTS -%{__ztsphp} --no-php-ini \ - $DEPMOD \ - --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ - --modules | grep %{pecl_name} - -: Upstream test suite for ZTS extension -TEST_PHP_EXECUTABLE=%{__ztsphp} \ -TEST_PHP_ARGS="-n $DEPMOD -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ -NO_INTERACTION=1 \ -REPORT_EXIT_STATUS=1 \ -%{__ztsphp} -n run-tests.php --show-diff -%endif - - -%clean -rm -rf %{buildroot} - - -%files -%defattr(-,root,root,-) -%{?_licensedir:%license NTS/LICENSE} -%doc %{pecl_docdir}/%{pecl_name} -%{pecl_xmldir}/%{name}.xml - -%config(noreplace) %{php_inidir}/%{ini_name} -%{php_extdir}/%{pecl_name}.so - -%if %{with_zts} -%config(noreplace) %{php_ztsinidir}/%{ini_name} -%{php_ztsextdir}/%{pecl_name}.so -%endif - - -%changelog -* Wed Mar 23 2016 Remi Collet - 2.0.0-0.4.RC3 -- Update to 2.0.0RC3 (no change) - -* Fri Mar 4 2016 Remi Collet - 2.0.0-0.3.RC2 -- Update to 2.0.0RC2 - -* Fri Nov 20 2015 Remi Collet - 2.0.0-0.2.RC1 -- fix PHP 7 and ZTS build - open https://bitbucket.org/osmanov/pecl-eio/issues/3 - open https://bitbucket.org/osmanov/pecl-eio/pull-requests/4 - -* Thu Nov 19 2015 Remi Collet - 2.0.0-0.1.RC1 -- Update to 2.0.0RC1 - -* Mon Sep 28 2015 Remi Collet - 1.2.6-1 -- Update to 1.2.6 -- don't install/register tests -- allow build against rh-php56 (as more-php56) -- drop runtime dependency on pear, new scriptlets - -* Wed Dec 24 2014 Remi Collet - 1.2.5-3.1 -- Fedora 21 SCL mass rebuild - -* Tue Aug 26 2014 Remi Collet - 1.2.5-3 -- improve SCL build - -* Wed Apr 9 2014 Remi Collet - 1.2.5-2 -- add numerical prefix to extension configuration file - -* Thu Mar 27 2014 Remi Collet - 1.2.5-1 -- Update to 1.2.5 (stable) - -* Sun Mar 23 2014 Remi Collet - 1.2.4-2 -- allow SCL build - -* Sat Mar 15 2014 Remi Collet - 1.2.4-1 -- Update to 1.2.4 (stable) -- install doc in pecl_docdir -- install tests in pecl_testdir - -* Tue Oct 8 2013 Remi Collet - 1.2.3-1 -- initial package diff --git a/php-pecl-eio.spec b/php-pecl-eio.spec index c4fa3c8..e5bac7a 100644 --- a/php-pecl-eio.spec +++ b/php-pecl-eio.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global pecl_name eio -%global with_zts 0%{?__ztsphp:1} +%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %if "%{php_version}" < "5.6" # After sockets %global ini_name z-%{pecl_name}.ini @@ -24,6 +24,7 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} %global sub_prefix %{scl_prefix} %endif %endif +%global prever RC3 %{?scl: %scl_package php-pecl-eio} @@ -33,12 +34,12 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} Summary: Provides interface to the libeio library Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 1.2.6 -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 2.0.0 +Release: 0.4.%{prever}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} -Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz +Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{?scl_prefix}php-devel > 5.3 @@ -49,27 +50,41 @@ BuildRequires: %{?scl_prefix}php-posix Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} +%if "%{php_version}" < "5.4" +# php 5.3.3 in EL-6 don't use arched virtual provides +# so only requires real packages instead +Requires: %{?scl_prefix}php-common%{?_isa} +%else Requires: %{?scl_prefix}php-sockets%{?_isa} +%endif %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} Provides: %{?scl_prefix}php-%{pecl_name} = %{version} Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} +%if "%{?scl_prefix}" != "%{?sub_prefix}" +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} # 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} +Obsoletes: php53-pecl-%{pecl_name} <= %{version} +Obsoletes: php53u-pecl-%{pecl_name} <= %{version} +Obsoletes: php54-pecl-%{pecl_name} <= %{version} +Obsoletes: php54w-pecl-%{pecl_name} <= %{version} %if "%{php_version}" > "5.5" -Obsoletes: php55u-pecl-%{pecl_name} -Obsoletes: php55w-pecl-%{pecl_name} +Obsoletes: php55u-pecl-%{pecl_name} <= %{version} +Obsoletes: php55w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "5.6" -Obsoletes: php56u-pecl-%{pecl_name} -Obsoletes: php56w-pecl-%{pecl_name} +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 %endif @@ -95,7 +110,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %setup -q -c -mv %{pecl_name}-%{version} NTS +mv %{pecl_name}-%{version}%{?prever} NTS # Don't install/register tests sed -e 's/role="test"/role="src"/' \ @@ -105,9 +120,9 @@ 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_eio.h) -if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then - : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever:-%{prever}}. +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}. exit 1 fi cd .. @@ -189,15 +204,11 @@ fi %check -# Need investigation (output order) +# Need investigation (output order, erratic results) rm ?TS/tests/eio_custom_basic.phpt -%if 0%{?rhel} <= 7 +%if 0%{?rhel} == 5 rm ?TS/tests/eio_fallocate_basic.phpt %endif -%if 0%{?rhel} <= 6 -rm ?TS/tests/eio_write_variation.phpt -rm ?TS/tests/fork.phpt -%endif DEPMOD= [ -f %{php_extdir}/sockets.so ] && DEPMOD="$DEPMOD -d extension=sockets.so" @@ -207,15 +218,15 @@ DEPMOD= cd NTS %{_bindir}/php --no-php-ini \ $DEPMOD \ - --define extension=modules/%{pecl_name}.so \ + --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ --modules | grep %{pecl_name} : Upstream test suite for NTS extension TEST_PHP_EXECUTABLE=%{_bindir}/php \ -TEST_PHP_ARGS="-n $DEPMOD -d extension=$PWD/modules/%{pecl_name}.so" \ +TEST_PHP_ARGS="-n $DEPMOD -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ NO_INTERACTION=1 \ REPORT_EXIT_STATUS=1 \ -%{_bindir}/php -n run-tests.php +%{_bindir}/php -n run-tests.php --show-diff %if %{with_zts} @@ -223,15 +234,15 @@ REPORT_EXIT_STATUS=1 \ cd ../ZTS %{__ztsphp} --no-php-ini \ $DEPMOD \ - --define extension=modules/%{pecl_name}.so \ + --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ --modules | grep %{pecl_name} : Upstream test suite for ZTS extension TEST_PHP_EXECUTABLE=%{__ztsphp} \ -TEST_PHP_ARGS="-n $DEPMOD -d extension=$PWD/modules/%{pecl_name}.so" \ +TEST_PHP_ARGS="-n $DEPMOD -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ NO_INTERACTION=1 \ REPORT_EXIT_STATUS=1 \ -%{__ztsphp} -n run-tests.php +%{__ztsphp} -n run-tests.php --show-diff %endif @@ -255,8 +266,19 @@ rm -rf %{buildroot} %changelog -* Tue Mar 8 2016 Remi Collet - 1.2.6-2 -- adapt for F24 +* Wed Mar 23 2016 Remi Collet - 2.0.0-0.4.RC3 +- Update to 2.0.0RC3 (no change) + +* Fri Mar 4 2016 Remi Collet - 2.0.0-0.3.RC2 +- Update to 2.0.0RC2 + +* Fri Nov 20 2015 Remi Collet - 2.0.0-0.2.RC1 +- fix PHP 7 and ZTS build + open https://bitbucket.org/osmanov/pecl-eio/issues/3 + open https://bitbucket.org/osmanov/pecl-eio/pull-requests/4 + +* Thu Nov 19 2015 Remi Collet - 2.0.0-0.1.RC1 +- Update to 2.0.0RC1 * Mon Sep 28 2015 Remi Collet - 1.2.6-1 - Update to 1.2.6 -- cgit