summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-pecl-ev-dev.spec35
1 files changed, 22 insertions, 13 deletions
diff --git a/php-pecl-ev-dev.spec b/php-pecl-ev-dev.spec
index 6eeb851..8d5324d 100644
--- a/php-pecl-ev-dev.spec
+++ b/php-pecl-ev-dev.spec
@@ -1,4 +1,4 @@
-# spec file for php-pecl-ev
+# remirepo spec file for php-pecl-ev
#
# Copyright (c) 2013-2015 Remi Collet
# License: CC-BY-SA
@@ -26,15 +26,16 @@
# After 20-sockets
%global ini_name 40-%{pecl_name}.ini
%endif
+%global prever RC1
Summary: Provides interface to libev library
Name: %{?scl_prefix}php-pecl-%{pecl_name}
-Version: 0.2.15
-Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Version: 1.0.0
+Release: 0.1.%{prever}%{?dist}%{!?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.4
@@ -84,21 +85,21 @@ Obsoletes: php70w-pecl-%{pecl_name} <= %{version}
The ev extension provides interface to libev library - high performance
full-featured event loop written in C.
-Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection}.
+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} NTS
+mv %{pecl_name}-%{version}%{?prever} NTS
# Don't register test files on install
sed -e '/role="test"/d' -i package.xml
cd NTS
# Sanity check, really often broken
-extver=$(sed -n '/define PHP_EV_VERSION/{s/.* "//;s/".*$//;p}' php_ev.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_EV_VERSION/{s/.* "//;s/".*$//;p}' php%(%{__php} -r 'echo PHP_MAJOR_VERSION;')/php_ev.h)
+if test "x${extver}" != "x%{version}%{?prever}"; then
+ : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever}.
exit 1
fi
cd ..
@@ -186,12 +187,12 @@ 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 --show-diff
@@ -200,14 +201,18 @@ REPORT_EXIT_STATUS=1 \
%if %{with_zts}
: Minimal load test for ZTS extension
cd ../ZTS
+
+# See https://bitbucket.org/osmanov/pecl-ev/issues/16
+rm tests/bug64788.phpt
+
%{__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 --show-diff
@@ -234,6 +239,10 @@ rm -rf %{buildroot}
%changelog
+* Fri Nov 20 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.1.RC1
+- Update to 1.0.0RC1
+- open https://bitbucket.org/osmanov/pecl-ev/issues/16 - ZTS segfault
+
* Mon May 04 2015 Remi Collet <remi@fedoraproject.org> - 0.2.15-1
- Update to 0.2.15 (stable, no change)
- drop runtime dependency on pear, new scriptlets