diff options
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | mustache-pr34.patch | 21 | ||||
| -rw-r--r-- | php-pecl-mustache.spec | 21 |
3 files changed, 14 insertions, 30 deletions
@@ -1,4 +1,4 @@ -Extension [ <persistent> extension #112 mustache version 0.7.4RC1 ] { +Extension [ <persistent> extension #112 mustache version 0.7.4RC2 ] { - Classes [8] { Class [ <internal:mustache> class MustacheAST ] { diff --git a/mustache-pr34.patch b/mustache-pr34.patch deleted file mode 100644 index d8ab8f9..0000000 --- a/mustache-pr34.patch +++ /dev/null @@ -1,21 +0,0 @@ -From bb038a0b28a8b5b2b12fe2ebd1873726d1feeed9 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Thu, 8 Jun 2017 11:35:56 +0200 -Subject: [PATCH] use proper command for build - ---- - config.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config.m4 b/config.m4 -index b795b02..51c3ef4 100644 ---- a/config.m4 -+++ b/config.m4 -@@ -69,6 +69,6 @@ if test "$PHP_MUSTACHE" != "no"; then - PHP_ADD_INCLUDE($LIBMUSTACHE_DIR/include/mustache) - - PHP_SUBST(MUSTACHE_SHARED_LIBADD) -- PHP_NEW_EXTENSION(mustache, $PHP_MUSTACHE_SOURCES, $ext_shared, , $PHP_MUSTACHE_FLAGS) -+ PHP_NEW_EXTENSION(mustache, $PHP_MUSTACHE_SOURCES, $ext_shared, , $PHP_MUSTACHE_FLAGS, cxx) - fi - diff --git a/php-pecl-mustache.spec b/php-pecl-mustache.spec index a6389b0..2223978 100644 --- a/php-pecl-mustache.spec +++ b/php-pecl-mustache.spec @@ -17,22 +17,20 @@ %global with_tests 0%{!?_without_tests:1} %global upstream_version 0.7.4 -%global upstream_prever RC1 +%global upstream_prever RC2 Summary: Mustache templating language Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 2%{?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;')}} License: MIT Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz -Patch0: %{pecl_name}-pr34.patch - BuildRequires: %{?scl_prefix}php-devel > 5.6 BuildRequires: %{?scl_prefix}php-pear -BuildRequires: libmustache-devel +BuildRequires: pkgconfig(mustache) %if 0%{?rhel} == 7 BuildRequires: devtoolset-6-toolchain %else @@ -94,7 +92,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -%patch0 -p1 # Sanity check, really often broken extver=$(sed -n '/PHP_MUSTACHE_VERSION/{s/.* "//;s/".*$//;p}' php_mustache.h) @@ -239,9 +236,17 @@ REPORT_EXIT_STATUS=1 \ %changelog -* Fri Jun 9 2017 Remi Collet <remi@remirepo.net> - 0.8.2~RC1-2 +* Fri Jun 9 2017 Remi Collet <remi@remirepo.net> - 0.7.4~RC2-1 +- update to 0.8.2RC2 +- drop patches merged upstream + +* Fri Jun 9 2017 Remi Collet <remi@remirepo.net> - 0.7.4~RC1-2 - use GCC 6.2 from devtoolset-6 on EL-7 +- open https://github.com/jbboehr/php-mustache/pull/36 pkgconfig +- open https://github.com/jbboehr/php-mustache/pull/37 php 7.2 +- open https://github.com/jbboehr/php-mustache/pull/38 warnings -* Thu Jun 8 2017 Remi Collet <remi@remirepo.net> - 0.8.2~RC1-1 +* Thu Jun 8 2017 Remi Collet <remi@remirepo.net> - 0.7.4~RC1-1 - initial package +- open https://github.com/jbboehr/php-mustache/pull/34 use cxx |