summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-05-24 10:36:29 +0200
committerRemi Collet <remi@remirepo.net>2018-05-24 10:36:29 +0200
commit019947aaae09eaf53186be95b6328d5aec967be6 (patch)
tree80737d685f14f96e34fb0378a058ae0aa1c09496
parentc5c6826bf09fc4e9e28f879146d9fd82bec60731 (diff)
test build
-rw-r--r--php-pecl-event.spec8
-rw-r--r--php54.patch12
2 files changed, 19 insertions, 1 deletions
diff --git a/php-pecl-event.spec b/php-pecl-event.spec
index ce476b6..2ae12fb 100644
--- a/php-pecl-event.spec
+++ b/php-pecl-event.spec
@@ -36,11 +36,13 @@
Summary: Provides interface to libevent library
Name: %{?sub_prefix}php-pecl-%{pecl_name}
Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 2%{?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
@@ -118,6 +120,7 @@ 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)
@@ -270,6 +273,9 @@ fi
%changelog
+* Thu May 24 2018 Remi Collet <remi@remirepo.net> - 2.4.0~RC2-2
+- test build
+
* Sun May 13 2018 Remi Collet <remi@remirepo.net> - 2.4.0~RC2-1
- update to 2.4.0RC2
diff --git a/php54.patch b/php54.patch
new file mode 100644
index 0000000..317aafe
--- /dev/null
+++ b/php54.patch
@@ -0,0 +1,12 @@
+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";
+ }
+ }
+