From 683fd69aff896998d0c0970bdb21f1d06071d5d8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 28 Jun 2018 09:03:01 +0200 Subject: add patch for PHP 7.3 from https://github.com/jbboehr/php-mustache/pull/48 --- php-pecl-mustache.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'php-pecl-mustache.spec') diff --git a/php-pecl-mustache.spec b/php-pecl-mustache.spec index ffaff3c..b614330 100644 --- a/php-pecl-mustache.spec +++ b/php-pecl-mustache.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-mustache # -# Copyright (c) 2017 Remi Collet +# Copyright (c) 2017-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -26,12 +26,14 @@ Summary: Mustache templating language Name: %{?sub_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;')}} +Release: 2%{?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: https://patch-diff.githubusercontent.com/raw/jbboehr/php-mustache/pull/48.patch + BuildRequires: %{?scl_prefix}php-devel >= 5.4 BuildRequires: %{?scl_prefix}php-pear BuildRequires: pkgconfig(mustache) @@ -96,6 +98,7 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS +%patch0 -p1 -b .pr48 # Sanity check, really often broken extver=$(sed -n '/PHP_MUSTACHE_VERSION/{s/.* "//;s/".*$//;p}' php_mustache.h) @@ -169,7 +172,7 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done -%if 0%{?fedora} < 24 +%if 0%{?fedora} < 24 && 0%{?rhel} < 8 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear if [ -x %{__pecl} ] ; then @@ -240,6 +243,10 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Thu Jun 28 2018 Remi Collet - 0.7.4-2 +- add patch for PHP 7.3 from + https://github.com/jbboehr/php-mustache/pull/48 + * Wed Jul 19 2017 Remi Collet - 0.7.4-1 - update to 0.7.4 (stable) -- cgit