summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-05-24 11:29:48 +0200
committerRemi Collet <remi@remirepo.net>2018-05-24 11:29:48 +0200
commit5d823e11d4e55875b25aedf348e18846982a88f1 (patch)
tree626e9b3ba5412c1e56d0298060f7293a08f4562c
parent019947aaae09eaf53186be95b6328d5aec967be6 (diff)
v2.4.0RC3
-rw-r--r--REFLECTION2
-rw-r--r--php-pecl-event.spec10
-rw-r--r--php54.patch12
3 files changed, 6 insertions, 18 deletions
diff --git a/REFLECTION b/REFLECTION
index 54578eb..00f562f 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #196 event version 2.4.0RC2 ] {
+Extension [ <persistent> extension #196 event version 2.4.0RC3 ] {
- Dependencies {
Dependency [ sockets (Required) ]
diff --git a/php-pecl-event.spec b/php-pecl-event.spec
index 2ae12fb..854535f 100644
--- a/php-pecl-event.spec
+++ b/php-pecl-event.spec
@@ -31,18 +31,16 @@
%global ini_name 40-%{pecl_name}.ini
%endif
%global upstream_version 2.4.0
-%global upstream_prever RC2
+%global upstream_prever RC3
Summary: Provides interface to libevent library
Name: %{?sub_prefix}php-pecl-%{pecl_name}
Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: PHP
URL: http://pecl.php.net/package/event
Source0: http://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
-Patch0: php54.patch
-
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel
BuildRequires: %{?scl_prefix}php-pear
@@ -120,7 +118,6 @@ sed -e 's/role="test"/role="src"/' \
mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS
cd NTS
-%patch0 -p0
# Sanity check, really often broken
DIR=$(%{__php} -r 'echo "php" . PHP_MAJOR_VERSION;')
extver=$(sed -n '/#define PHP_EVENT_VERSION/{s/.* "//;s/".*$//;p}' $DIR/php_event.h)
@@ -273,6 +270,9 @@ fi
%changelog
+* Thu May 24 2018 Remi Collet <remi@remirepo.net> - 2.4.0~RC3-1
+- update to 2.4.0RC3
+
* Thu May 24 2018 Remi Collet <remi@remirepo.net> - 2.4.0~RC2-2
- test build
diff --git a/php54.patch b/php54.patch
deleted file mode 100644
index 317aafe..0000000
--- a/php54.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up tests/10-event-data-dtor.phpt.old tests/10-event-data-dtor.phpt
---- tests/10-event-data-dtor.phpt.old 2018-05-24 10:02:40.399787966 +0200
-+++ tests/10-event-data-dtor.phpt 2018-05-24 10:02:52.253859826 +0200
-@@ -11,7 +11,7 @@ class _Indicator {
- $this->i = $i;
- }
- public function __destruct() {
-- echo $this->i, "\n";
-+ echo "" . $this->i . "\n";
- }
- }
-