v0.6.2

5 files changed, 6 insertions, 73 deletions

diff --git a/48d54026ef6e448bc91949b279103a313a5b053f.patch b/48d54026ef6e448bc91949b279103a313a5b053f.patch
deleted file mode 100644
index 64654e4..0000000
--- a/48d54026ef6e448bc91949b279103a313a5b053f.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 48d54026ef6e448bc91949b279103a313a5b053f Mon Sep 17 00:00:00 2001
-From: Timandes White <timands@gmail.com>
-Date: Thu, 19 Jul 2018 10:12:23 +0800
-Subject: [PATCH] Try to fix 'undefined symbol: zoo_wgetconfig' (#22)
-
----
- config.m4 | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/config.m4 b/config.m4
-index d7fed5a..5465685 100644
---- a/config.m4
-+++ b/config.m4
-@@ -106,9 +106,15 @@ if test "$PHP_ZOOKEEPER" != "no"; then
-         AC_DEFINE(HAVE_PTHREAD,1,[ ])
-     ])
- 
--    AC_DEFINE(THREADED,1,[Must define this constant after zookeeper-3.5.0 to use multi-threaded library])
-+    ZOO_MINOR_VERSION=$(cat ${PHP_LIBZOOKEEPER_INCDIR}/zookeeper/zookeeper_version.h |grep ZOO_MINOR_VERSION|awk '{print $3}')
-+    PHP_ZOOKEEPER_CONFIG_FILES=""
-+    if test ${ZOO_MINOR_VERSION} -eq 5; then
-+      PHP_ZOOKEEPER_CONFIG_FILES="php_zookeeper_config_class.c"
-+      AC_DEFINE(THREADED,1,[Must define this constant after zookeeper-3.5.0 to use multi-threaded library])
-+    fi
-+
-     PHP_SUBST(ZOOKEEPER_SHARED_LIBADD)
--    PHP_NEW_EXTENSION(zookeeper, php_zookeeper.c zoo_lock.c $SESSION_EXTRA_FILES php_zookeeper_exceptions.c php_zookeeper_config_class.c php_zookeeper_stat.c php_zookeeper_callback.c php_zookeeper_log.c, $ext_shared,,$SESSION_INCLUDES)
-+    PHP_NEW_EXTENSION(zookeeper, php_zookeeper.c zoo_lock.c $SESSION_EXTRA_FILES php_zookeeper_exceptions.c ${PHP_ZOOKEEPER_CONFIG_FILES} php_zookeeper_stat.c php_zookeeper_callback.c php_zookeeper_log.c, $ext_shared,,$SESSION_INCLUDES)
- 
-   fi
- 
diff --git a/PHPINFO b/PHPINFO
index 3417ef0..95803b6 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,7 +2,7 @@
 zookeeper
 
 zookeeper support => enabled
-version => 0.6.1
+version => 0.6.2
 libzookeeper version => 3.4.9
 
 Directive => Local Value => Master Value
diff --git a/REFLECTION b/REFLECTION
index 5a747af..e50919e 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #179 zookeeper version 0.6.1 ] {
+Extension [ <persistent> extension #179 zookeeper version 0.6.2 ] {
 
   - INI {
     Entry [ zookeeper.recv_timeout <ALL> ]
diff --git a/c3f9d604adc77bc16601cebd0aabecaf21fb563b.patch b/c3f9d604adc77bc16601cebd0aabecaf21fb563b.patch
deleted file mode 100644
index bedc8be..0000000
--- a/c3f9d604adc77bc16601cebd0aabecaf21fb563b.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c3f9d604adc77bc16601cebd0aabecaf21fb563b Mon Sep 17 00:00:00 2001
-From: Timandes White <timands@gmail.com>
-Date: Thu, 19 Jul 2018 11:07:12 +0800
-Subject: [PATCH] Fix path of zookeeper_version.h in config.m4
-
----
- config.m4 | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/config.m4 b/config.m4
-index 5465685..7191109 100644
---- a/config.m4
-+++ b/config.m4
-@@ -106,13 +106,17 @@ if test "$PHP_ZOOKEEPER" != "no"; then
-         AC_DEFINE(HAVE_PTHREAD,1,[ ])
-     ])
- 
--    ZOO_MINOR_VERSION=$(cat ${PHP_LIBZOOKEEPER_INCDIR}/zookeeper/zookeeper_version.h |grep ZOO_MINOR_VERSION|awk '{print $3}')
-+    AC_MSG_CHECKING([whether ZooKeeper Config is enabled])
-+    ZOO_MINOR_VERSION=$(cat ${PHP_LIBZOOKEEPER_INCDIR}/zookeeper_version.h |grep ZOO_MINOR_VERSION|awk '{print $3}')
-     PHP_ZOOKEEPER_CONFIG_FILES=""
-     if test ${ZOO_MINOR_VERSION} -eq 5; then
-       PHP_ZOOKEEPER_CONFIG_FILES="php_zookeeper_config_class.c"
--      AC_DEFINE(THREADED,1,[Must define this constant after zookeeper-3.5.0 to use multi-threaded library])
-+      AC_MSG_RESULT([enabled])
-+    else
-+      AC_MSG_RESULT([disabled])
-     fi
- 
-+    AC_DEFINE(THREADED,1,[Must define this constant after zookeeper-3.5.0 to use multi-threaded library])
-     PHP_SUBST(ZOOKEEPER_SHARED_LIBADD)
-     PHP_NEW_EXTENSION(zookeeper, php_zookeeper.c zoo_lock.c $SESSION_EXTRA_FILES php_zookeeper_exceptions.c ${PHP_ZOOKEEPER_CONFIG_FILES} php_zookeeper_stat.c php_zookeeper_callback.c php_zookeeper_log.c, $ext_shared,,$SESSION_INCLUDES)
- 
diff --git a/php-pecl-zookeeper.spec b/php-pecl-zookeeper.spec
index 8f3611a..2427611 100644
--- a/php-pecl-zookeeper.spec
+++ b/php-pecl-zookeeper.spec
@@ -21,16 +21,13 @@
 
 Summary:        PHP extension for interfacing with Apache ZooKeeper
 Name:           %{?scl_prefix}php-pecl-%{pecl_name}
-Version:        0.6.1
+Version:        0.6.2
 Release:        1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 License:        PHP
 Group:          Development/Languages
 URL:            http://github.com/andreiz/php-zookeeper
 Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 
-Patch0:         https://github.com/php-zookeeper/php-zookeeper/commit/48d54026ef6e448bc91949b279103a313a5b053f.patch
-Patch1:         https://github.com/php-zookeeper/php-zookeeper/commit/c3f9d604adc77bc16601cebd0aabecaf21fb563b.patch
-
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel > 7
 BuildRequires:  %{?scl_prefix}php-pear
@@ -88,9 +85,6 @@ mv %{pecl_name}-%{version} NTS
 %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml}
 
 cd NTS
-%patch0 -p1 -b .up1
-%patch1 -p1 -b .up2
-
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_ZOOKEEPER_VERSION/{s/.* "//;s/".*$//;p}' php_zookeeper.h)
 if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then
@@ -213,6 +207,9 @@ cd ../ZTS
 
 
 %changelog
+* Mon Jul 23 2018 Remi Collet <remi@remirepo.net> - 0.6.2-1
+- update to 0.6.2
+
 * Fri Jul 20 2018 Remi Collet <remi@remirepo.net> - 0.6.1-1
 - update to 0.6.1
 - raise dependency on PHP 7