summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--0001-fix-test-for-php-7-8.patch23
-rw-r--r--PHPINFO4
-rw-r--r--REFLECTION4
-rw-r--r--php-pecl-handlebars.spec14
4 files changed, 9 insertions, 36 deletions
diff --git a/0001-fix-test-for-php-7-8.patch b/0001-fix-test-for-php-7-8.patch
deleted file mode 100644
index ddf4c6a..0000000
--- a/0001-fix-test-for-php-7-8.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 05091f6b4a68ff4924c399bf6ac77ceca40ddaf6 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Fri, 17 Apr 2020 15:01:32 +0200
-Subject: [PATCH] fix test for php 7/8
-
----
- tests/missing-file.phpt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/missing-file.phpt b/tests/missing-file.phpt
-index 8bd131e..f62eb7d 100644
---- a/tests/missing-file.phpt
-+++ b/tests/missing-file.phpt
-@@ -12,5 +12,5 @@ try {
- echo $e->getMessage(), "\n";
- }
- --EXPECTF--
--Warning: Handlebars\VM::renderFile(dontreal): failed to open stream: No such file or directory in %s on line %d
-+Warning: Handlebars\VM::renderFile(dontreal): %ailed to open stream: No such file or directory in %s on line %d
- Failed to read input template file
---
-2.25.2
-
diff --git a/PHPINFO b/PHPINFO
index 4c9f96f..4aa04f9 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -1,8 +1,8 @@
handlebars
-Version => 0.9.0
-Released => 2020-04-17
+Version => 0.9.1
+Released => 2020-04-18
Authors => John Boehr <jbboehr@gmail.com> (lead)
Spec Version => 4.0.5
PSR support => active
diff --git a/REFLECTION b/REFLECTION
index 439623d..b3335c7 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #113 handlebars version 0.9.0 ] {
+Extension [ <persistent> extension #113 handlebars version 0.9.1 ] {
- Dependencies {
Dependency [ psr (Optional) ]
@@ -36,7 +36,7 @@ Extension [ <persistent> extension #113 handlebars version 0.9.0 ] {
- Constants [4] {
Constant [ int Handlebars\PSR ] { 1 }
- Constant [ string Handlebars\VERSION ] { 0.9.0 }
+ Constant [ string Handlebars\VERSION ] { 0.9.1 }
Constant [ string Handlebars\LIBVERSION ] { 0.7.0 }
Constant [ null Handlebars\CACHE_BACKEND ] { }
}
diff --git a/php-pecl-handlebars.spec b/php-pecl-handlebars.spec
index 4fe11c2..6f8a343 100644
--- a/php-pecl-handlebars.spec
+++ b/php-pecl-handlebars.spec
@@ -17,7 +17,7 @@
%global ini_name 50-%{pecl_name}.ini
%global with_tests 0%{!?_without_tests:1}
-%global upstream_version 0.9.0
+%global upstream_version 0.9.1
#global upstream_prever RC2
Summary: Handlebars templating language
@@ -28,8 +28,6 @@ License: BSD
URL: https://pecl.php.net/package/%{pecl_name}
Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
-Patch0: 0001-fix-test-for-php-7-8.patch
-
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel >= 7.2
BuildRequires: %{?scl_prefix}php-pear
@@ -103,8 +101,6 @@ mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS
cd NTS
-%patch0 -p1
-
# Sanity check, really often broken
extver=$(sed -n '/PHP_HANDLEBARS_VERSION/{s/.* "//;s/".*$//;p}' php_handlebars.h)
if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
@@ -209,10 +205,6 @@ fi
%check
-%if %{__isa_bits} < 64
-rm ?TS/tests/vm/renderFromBinaryString.phpt
-%endif
-
: Minimal load test for NTS extension
cd NTS
%{__php} --no-php-ini \
@@ -271,6 +263,10 @@ REPORT_EXIT_STATUS=1 \
%changelog
+* Sun Apr 19 2020 Remi Collet <remi@remirepo.net> - 0.9.1-1
+- update to 0.9.1
+- drop patch merged upstream
+
* Fri Apr 17 2020 Remi Collet <remi@remirepo.net> - 0.9.0-1
- update to 0.9.0
- raise dependency on PHP 7.2