diff options
| author | Remi Collet <remi@remirepo.net> | 2024-07-15 16:12:00 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2024-07-15 16:12:00 +0200 |
| commit | 27baeb0ff26df2884f067eb714162ea6c025c1f1 (patch) | |
| tree | f0e09f539def1fc166efdd5b45784cd16757160b /php-pecl-handlebars.spec | |
| parent | 98dcb324f84a18b326746bd573cc6fea1169cb33 (diff) | |
https://github.com/jbboehr/php-handlebars/pull/78
Diffstat (limited to 'php-pecl-handlebars.spec')
| -rw-r--r-- | php-pecl-handlebars.spec | 37 |
1 files changed, 11 insertions, 26 deletions
diff --git a/php-pecl-handlebars.spec b/php-pecl-handlebars.spec index a79b327..33f0dea 100644 --- a/php-pecl-handlebars.spec +++ b/php-pecl-handlebars.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-handlebars # -# Copyright (c) 2017-2023 Remi Collet +# Copyright (c) 2017-2024 Remi Collet # License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -22,12 +22,13 @@ Summary: Handlebars templating language Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: BSD-2-Clause URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{sources}.tgz Patch0: upstream.patch +Patch1: 0001-Fix-Implicitly-marking-parameter-.-as-nullable-is-de.patch BuildRequires: make BuildRequires: %{?dtsprefix}gcc @@ -38,9 +39,7 @@ BuildRequires: libtalloc-devel Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} -%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 Recommends: %{?scl_prefix}php-psr%{?_isa} -%endif Provides: %{?scl_prefix}php-%{pecl_name} = %{version} Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} @@ -69,11 +68,14 @@ These are the files needed to compile programs using %{name}. %setup -q -c # Don't install/register License -%{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} +sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml cd %{sources} %patch -P0 -p1 -b .up +if [ $(%{__php} -r 'echo PHP_VERSION_ID;') -ge 80400 ]; then +%patch -P1 -p1 -b .up +fi # Honours RPM build options sed -e '/ LDFLAGS=/d;/ CFLAGS=/d;' -i config.m4 @@ -164,26 +166,6 @@ do install -Dpm 644 %{sources}/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done -%if 0%{?fedora} < 24 && 0%{?rhel} < 8 -# when pear installed alone, after us -%triggerin -- %{?scl_prefix}php-pear -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -# posttrans as pear can be installed after us -%posttrans -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -%postun -if [ $1 -eq 0 -a -x %{__pecl} ] ; then - %{pecl_uninstall} %{pecl_name} >/dev/null || : -fi -%endif - - %check cd %{sources} @@ -220,7 +202,6 @@ REPORT_EXIT_STATUS=1 \ %files -%{!?_licensedir:%global license %%doc} %license %{sources}/LICENSE.md %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -244,6 +225,10 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Mon Jul 15 2024 Remi Collet <remi@remirepo.net> - 1.0.0-4 +- add patch for test suite with 8.4 from + https://github.com/jbboehr/php-handlebars/pull/78 + * Fri Sep 1 2023 Remi Collet <remi@remirepo.net> - 1.0.0-3 - build out of sources tree |