From 60487a0a8c5b15a44cdaa4d04f8ef7b594655a4d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 12 Nov 2018 10:02:10 +0100
Subject: update to 0.8.1 (no change)

---
 PHPINFO                |  4 ++--
 REFLECTION             |  2 +-
 php-pecl-mustache.spec |  8 ++++----
 php5to7.h              | 43 -------------------------------------------
 4 files changed, 7 insertions(+), 50 deletions(-)
 delete mode 100644 php5to7.h

diff --git a/PHPINFO b/PHPINFO
index 722c153..d24da98 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -1,8 +1,8 @@
 
 mustache
 
-Version => 0.8.0
-Released => 2018-11-11
+Version => 0.8.1
+Released => 2018-11-12
 Revision => master
 Authors => John Boehr <jbboehr@gmail.com> (lead)
 Spec Version => 1.1.2
diff --git a/REFLECTION b/REFLECTION
index be5449b..b4f8112 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #119 mustache version 0.8.0 ] {
+Extension [ <persistent> extension #119 mustache version 0.8.1 ] {
 
   - Classes [7] {
     Class [ <internal:mustache> class MustacheAST ] {
diff --git a/php-pecl-mustache.spec b/php-pecl-mustache.spec
index 0fcaaf4..a8de24f 100644
--- a/php-pecl-mustache.spec
+++ b/php-pecl-mustache.spec
@@ -16,7 +16,7 @@
 %global ini_name   40-%{pecl_name}.ini
 %global with_tests 0%{!?_without_tests:1}
 
-%global upstream_version 0.8.0
+%global upstream_version 0.8.1
 #global upstream_prever  RC2
 
 Summary:        Mustache templating language
@@ -26,7 +26,6 @@ Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_
 License:        MIT
 URL:            http://pecl.php.net/package/%{pecl_name}
 Source0:        http://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
-Source1:        https://raw.githubusercontent.com/jbboehr/php-mustache/master/php5to7.h
 
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel >= 5.6
@@ -97,8 +96,6 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd NTS
-cp %{SOURCE1} .
-
 # Sanity check, really often broken
 extver=$(sed -n '/PHP_MUSTACHE_VERSION/{s/.* "//;s/".*$//;p}' php_mustache.h)
 if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
@@ -243,6 +240,9 @@ REPORT_EXIT_STATUS=1 \
 
 # Notice no more EL-6 build (compiler issue and segfaults)
 %changelog
+* Mon Nov 12 2018 Remi Collet <remi@remirepo.net> - 0.8.1-1
+- update to 0.8.1 (no change)
+
 * Mon Nov 12 2018 Remi Collet <remi@remirepo.net> - 0.8.0-1
 - update to 0.8.0
 - drop patch merged upstream
diff --git a/php5to7.h b/php5to7.h
deleted file mode 100644
index 84fd3dd..0000000
--- a/php5to7.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-#ifndef PHP_MUSTACHE_PHP5TO7
-#define PHP_MUSTACHE_PHP5TO7
-
-#if PHP_MAJOR_VERSION >= 7
-#include <zend_string.h>
-#endif
-
-#if PHP_MAJOR_VERSION < 7
-#define _add_next_index_string(...) add_next_index_string(__VA_ARGS__, 1)
-#define _add_assoc_string(...) add_assoc_string(__VA_ARGS__, 1)
-#define _add_assoc_string_ex(...) add_assoc_string_ex(__VA_ARGS__, 1)
-#define _add_assoc_stringl_ex(...) add_assoc_stringl_ex(__VA_ARGS__, 1)
-#define _RETURN_STRING(a) RETURN_STRING(a, 1)
-#define _RETVAL_STRING(a) RETVAL_STRING(a, 1)
-#define _RETVAL_STRINGL(a, b) RETVAL_STRINGL(a, b, 1)
-#define _DECLARE_ZVAL(name) zval * name
-#define _INIT_ZVAL INIT_ZVAL
-#define _ALLOC_INIT_ZVAL(name) ALLOC_INIT_ZVAL(name)
-#define _STRS ZEND_STRS
-#define _zend_read_property(a, b, c, d, e, f) zend_read_property(a, b, c, d, e TSRMLS_CC)
-#define _zend_register_internal_class_ex(class, parent) zend_register_internal_class_ex(class, parent, NULL TSRMLS_CC)
-#define _ZVAL_STRINGL(a, b, c) ZVAL_STRINGL(a, b, c, 1)
-typedef int strsize_t;
-#else
-#define _add_next_index_string add_next_index_string
-#define _add_assoc_string(z, k, s) add_assoc_string_ex(z, k, strlen(k)+1, s)
-#define _add_assoc_string_ex add_assoc_string_ex
-#define _add_assoc_stringl_ex add_assoc_stringl_ex
-#define _RETURN_STRING(a) RETURN_STRING(a)
-#define _RETVAL_STRING(a) RETVAL_STRING(a)
-#define _RETVAL_STRINGL RETVAL_STRINGL
-#define _DECLARE_ZVAL(name) zval name ## _v; zval * name = &name ## _v
-#define _INIT_ZVAL ZVAL_NULL
-#define _ALLOC_INIT_ZVAL(name) ZVAL_NULL(name)
-#define _STRS ZEND_STRL
-#define _zend_read_property(a, b, c, d, e, f) zend_read_property(a, b, c, d, e, f)
-#define _zend_register_internal_class_ex zend_register_internal_class_ex
-#define _ZVAL_STRINGL ZVAL_STRINGL
-typedef size_t strsize_t;
-#endif
-
-#endif /* PHP_MUSTACHE_PHP5TO7 */
-- 
cgit