From 7362daf0e46520bff67f41f1294c8df3c5096306 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Tue, 5 Dec 2017 17:31:40 +0200 Subject: [PATCH] up to e702b5f91 snapshot --- php-pecl-memcache.spec | 10 +++++----- tests.patch | 22 ---------------------- 2 files changed, 5 insertions(+), 27 deletions(-) delete mode 100644 tests.patch diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec index be13349..1e8f01c 100644 --- a/php-pecl-memcache.spec +++ b/php-pecl-memcache.spec @@ -5,23 +5,24 @@ %define php_name php%{?php_suffix} %define modname memcache %define php_min_version 5.0.0 +%define commit e702b5f91 %include /usr/lib/rpm/macros.php Summary: %{modname} - a memcached extension Summary(pl.UTF-8): %{modname} - rozszerzenie memcached Name: %{php_name}-pecl-%{modname} Version: 3.0.9 -Release: 1 +Release: 2 License: PHP 3.01 Group: Development/Languages/PHP #Source0: http://pecl.php.net/get/%{modname}-%{version}.tgz -Source0: https://github.com/websupport-sk/pecl-memcache/archive/NON_BLOCKING_IO_php7.tar.gz -# Source0-md5: 7751d8191302a726449d7c6506b8783d +# https://github.com/websupport-sk/pecl-memcache/commits/NON_BLOCKING_IO_php7 +Source0: https://github.com/websupport-sk/pecl-memcache/archive/%{commit}/%{modname}-%{version}-%{commit}.tar.gz +# Source0-md5: 945e6a30b3cac160abf9b6d103c5676b Source1: %{modname}.ini Source2: %{modname}-apache.conf Source3: %{modname}-lighttpd.conf Source4: config.php Patch0: %{modname}-webapp.patch -Patch1: tests.patch URL: http://pecl.php.net/package/memcache/ BuildRequires: %{php_name}-devel >= 3:5.0.0 BuildRequires: %{php_name}-xml @@ -91,7 +92,6 @@ memcache. %setup -qc mv pecl-%{modname}-*/{.??*,*} . %patch0 -p1 -%patch1 -p1 # locks up on carme, likely due udp very long timeout rm tests/039.phpt diff --git a/tests.patch b/tests.patch deleted file mode 100644 index 6485505..0000000 --- a/tests.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://github.com/websupport-sk/pecl-memcache/pull/16 - -commit efad82d9517a13ec0073525759ac900a55c27c99 -Author: Elan Ruusamäe -Date: Wed Nov 23 03:59:51 2016 +0200 - - move connect to proper section to make SKIP work - - otherwise this test will FAIL instead of SKIP if memcache server is not available - -diff --git a/tests/pecl16442.phpt b/tests/pecl16442.phpt -index b1a7edf..499c645 100644 ---- a/tests/pecl16442.phpt -+++ b/tests/pecl16442.phpt -@@ -1,5 +1,7 @@ - --TEST-- - PECL bug #16442 (memcache_set fail with integer value) -+--SKIPIF-- -+ - --FILE-- -