update to 1.0.0

raise dependency on libhandlebars 1.0.0

1 files changed, 56 insertions, 29 deletions

diff --git a/php-pecl-handlebars.spec b/php-pecl-handlebars.spec
index 175b621..fe771ec 100644
--- a/php-pecl-handlebars.spec
+++ b/php-pecl-handlebars.spec
@@ -1,13 +1,12 @@
 # remirepo spec file for php-pecl-handlebars
 #
-# Copyright (c) 2017-2021 Remi Collet
+# Copyright (c) 2017-2022 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
 %if 0%{?scl:1}
-%global sub_prefix %{scl_prefix}
 %scl_package       php-pecl-handlebars
 %endif
 
@@ -18,11 +17,11 @@
 # After 40-psr.ini
 %global ini_name   50-%{pecl_name}.ini
 
-%global upstream_version 0.9.2
+%global upstream_version 1.0.0
 #global upstream_prever  RC2
 
 Summary:        Handlebars templating language
-Name:           %{?sub_prefix}php-pecl-%{pecl_name}
+Name:           %{?scl_prefix}php-pecl-%{pecl_name}
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
 Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:        BSD
@@ -33,7 +32,7 @@ BuildRequires:  make
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel >= 7.2
 BuildRequires:  %{?scl_prefix}php-pear
-BuildRequires:  libhandlebars-devel
+BuildRequires:  libhandlebars-devel >= 1.0.0
 BuildRequires:  libtalloc-devel
 
 Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
@@ -47,23 +46,6 @@ Provides:       %{?scl_prefix}php-%{pecl_name}               = %{version}
 Provides:       %{?scl_prefix}php-%{pecl_name}%{?_isa}       = %{version}
 Provides:       %{?scl_prefix}php-pecl(%{pecl_name})         = %{version}
 Provides:       %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
-%if "%{?scl_prefix}" != "%{?sub_prefix}"
-Provides:       %{?scl_prefix}php-pecl-%{pecl_name}          = %{version}-%{release}
-Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
-%endif
-
-%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
-# Other third party repo stuff
-%if "%{php_version}" > "7.3"
-Obsoletes:     php73-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "7.4"
-Obsoletes:     php74-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "8.0"
-Obsoletes:     php80-pecl-%{pecl_name} <= %{version}
-%endif
-%endif
 
 
 %description
@@ -78,10 +60,6 @@ Summary:       %{name} developer files (header)
 Group:         Development/Libraries
 Requires:      %{name}%{?_isa} = %{version}-%{release}
 Requires:      %{?scl_prefix}php-devel%{?_isa}
-%if "%{?scl_prefix}" != "%{?sub_prefix}"
-Provides:      %{?scl_prefix}php-pecl-%{pecl_name}-devel = %{version}-%{release}
-Provides:      %{?scl_prefix}php-pecl-%{pecl_name}-devel%{?_isa} = %{version}-%{release}
-%endif
 
 %description devel
 These are the files needed to compile programs using %{name}.
@@ -96,6 +74,9 @@ mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS
 
 
 cd NTS
+# Honours RPM build options
+sed -e '/ LDFLAGS=/d;/ CFLAGS=/d;' -i config.m4
+
 # 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
@@ -115,7 +96,7 @@ cat << 'EOF' | tee %{ini_name}
 extension=%{pecl_name}.so
 
 ; Configuration
-;handlebars.pool_size = '128k'
+;handlebars.pool_size = 0
 ;handlebars.cache.enable = 1
 ;handlebars.cache.enable_cli = 0
 ;handlebars.cache.backend = 'mmap'
@@ -135,6 +116,7 @@ cd NTS
 %configure \
     --enable-handlebars \
     --disable-handlebars-psr \
+    --enable-handlebars-ast  \
     --with-libdir=%{_lib} \
     --with-php-config=%{_bindir}/php-config
 
@@ -146,6 +128,7 @@ cd ../ZTS
 %configure \
     --enable-handlebars \
     --disable-handlebars-psr \
+    --enable-handlebars-ast  \
     --with-libdir=%{_lib} \
     --with-php-config=%{_bindir}/zts-php-config
 
@@ -208,10 +191,50 @@ cd NTS
 
 %if %{with tests}
 OPT="-q -P --show-diff"
-%if "%{php_version}" > "7.4"
+%if "%{php_version}" >= "7.4"
 OPT="$OPT %{?_smp_mflags}"
 %endif
 
+%if "%{php_version}" >= "8.1"
+rm ../?TS/tests/handlebars/export/helpers/050.phpt
+rm ../?TS/tests/handlebars/export/helpers/051.phpt
+rm ../?TS/tests/handlebars/export/helpers/053.phpt
+rm ../?TS/tests/handlebars/export/helpers/054.phpt
+rm ../?TS/tests/handlebars/export/helpers/055.phpt
+rm ../?TS/tests/handlebars/export/helpers/056.phpt
+rm ../?TS/tests/handlebars/export/helpers/064.phpt
+rm ../?TS/tests/handlebars/export/partials/007.phpt
+rm ../?TS/tests/handlebars/export/partials/008.phpt
+rm ../?TS/tests/handlebars/export/partials/054.phpt
+rm ../?TS/tests/handlebars/export/strict/005.phpt
+rm ../?TS/tests/handlebars/export/string-params/001.phpt
+rm ../?TS/tests/handlebars/export/string-params/002.phpt
+rm ../?TS/tests/handlebars/export/string-params/003.phpt
+rm ../?TS/tests/handlebars/export/string-params/004.phpt
+rm ../?TS/tests/handlebars/export/string-params/005.phpt
+rm ../?TS/tests/handlebars/export/string-params/006.phpt
+rm ../?TS/tests/handlebars/export/string-params/007.phpt
+rm ../?TS/tests/handlebars/export/string-params/008.phpt
+rm ../?TS/tests/handlebars/export/subexpressions/015.phpt
+rm ../?TS/tests/handlebars/export/subexpressions/016.phpt
+rm ../?TS/tests/handlebars/export/track-ids/002.phpt
+rm ../?TS/tests/handlebars/export/track-ids/003.phpt
+rm ../?TS/tests/handlebars/export/track-ids/004.phpt
+rm ../?TS/tests/handlebars/export/track-ids/005.phpt
+rm ../?TS/tests/handlebars/export/track-ids/006.phpt
+rm ../?TS/tests/handlebars/export/track-ids/007.phpt
+rm ../?TS/tests/handlebars/export/track-ids/008.phpt
+rm ../?TS/tests/handlebars/export/track-ids/009.phpt
+rm ../?TS/tests/handlebars/export/track-ids/010.phpt
+rm ../?TS/tests/handlebars/export/track-ids/011.phpt
+rm ../?TS/tests/handlebars/export/track-ids/012.phpt
+rm ../?TS/tests/handlebars/export/track-ids/013.phpt
+rm ../?TS/tests/handlebars/export/track-ids/014.phpt
+rm ../?TS/tests/handlebars/export/track-ids/015.phpt
+rm ../?TS/tests/handlebars/export/track-ids/016.phpt
+rm ../?TS/tests/handlebars/export/track-ids/017.phpt
+%endif
+
 # Upstream test suite
 TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \
 REPORT_EXIT_STATUS=1 \
@@ -229,7 +252,7 @@ cd ../ZTS
 # Upstream test suite
 TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \
 REPORT_EXIT_STATUS=1 \
-%{__ztsphp} -n run-tests.php $OPY
+%{__ztsphp} -n run-tests.php $OPT
 %endif
 %endif
 
@@ -259,6 +282,10 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Mon Nov 28 2022 Remi Collet <remi@remirepo.net> - 1.0.0-1
+- update to 1.0.0
+- raise dependency on libhandlebars 1.0.0
+
 * Mon Dec  7 2020 Remi Collet <remi@remirepo.net> - 0.9.2-1
 - update to 0.9.2