summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--31.patch25
-rw-r--r--REFLECTION2
-rw-r--r--php-pecl-yaconf.spec10
3 files changed, 6 insertions, 31 deletions
diff --git a/31.patch b/31.patch
deleted file mode 100644
index b9e4f72..0000000
--- a/31.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f08ca66aa96c75658ba1eb1e8918189f925553c1 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Sun, 25 Jun 2017 07:28:55 +0200
-Subject: [PATCH] IS_TYPE_IMMUTABLE is dropped in 7.2
-
----
- yaconf.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/yaconf.c b/yaconf.c
-index 8faa0b6..55b6731 100644
---- a/yaconf.c
-+++ b/yaconf.c
-@@ -92,7 +92,11 @@ static void php_yaconf_hash_init(zval *zv, size_t size) /* {{{ */ {
- GC_FLAGS(ht) |= IS_ARRAY_IMMUTABLE;
- GC_REFCOUNT(ht) = 2;
- ZVAL_ARR(zv, ht);
-+#if PHP_VERSION_ID < 70200
- Z_TYPE_FLAGS_P(zv) = IS_TYPE_IMMUTABLE;
-+#else
-+ Z_TYPE_FLAGS_P(zv) = IS_TYPE_COPYABLE;
-+#endif
- }
- /* }}} */
-
diff --git a/REFLECTION b/REFLECTION
index 7f8ac06..3440f75 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #156 yaconf version 1.0.5 ] {
+Extension [ <persistent> extension #160 yaconf version 1.0.6 ] {
- INI {
Entry [ yaconf.directory <SYSTEM> ]
diff --git a/php-pecl-yaconf.spec b/php-pecl-yaconf.spec
index c1cbc3a..081700b 100644
--- a/php-pecl-yaconf.spec
+++ b/php-pecl-yaconf.spec
@@ -19,20 +19,18 @@
Summary: Yet Another Configurations Container
Name: %{?scl_prefix}php-pecl-yaconf
-Version: 1.0.5
+Version: 1.0.6
%if 0%{?gh_date:1}
Release: 0.9.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz
%else
-Release: 3%{?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;')}}
Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
%endif
License: PHP
Group: Development/Languages
URL: https://github.com/%{gh_owner}/%{gh_project}
-Patch0: 31.patch
-
BuildRequires: %{?scl_prefix}php-devel > 7
BuildRequires: %{?scl_prefix}php-pear
@@ -99,7 +97,6 @@ mv %{pecl_name}-%{version} NTS
%{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml}
cd NTS
-%patch0 -p1 -b .pr31
# Sanity check, really often broken
extver=$(sed -n '/#define PHP_YACONF_VERSION/{s/.* "//;s/".*$//;p}' php_yaconf.h)
@@ -245,6 +242,9 @@ fi
%changelog
+* Tue Aug 1 2017 Remi Collet <remi@remirepo.net> - 1.0.6-1
+- Update to 1.0.6
+
* Tue Jul 18 2017 Remi Collet <remi@remirepo.net> - 1.0.5-3
- rebuild for PHP 7.2.0beta1 new API