From 1157ce017f8bdcfdd6214202ddeafed29918d3e5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 4 Oct 2019 14:54:00 +0200 Subject: add upstream patches for 1946 and 1949 --- zephir.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'zephir.spec') diff --git a/zephir.spec b/zephir.spec index 36b8494..de3b430 100644 --- a/zephir.spec +++ b/zephir.spec @@ -26,7 +26,7 @@ Name: %{?scl_prefix}%{gh_project} Version: 0.12.7 -Release: 1%{?gh_date:.%{gh_date}.%{gh_short}}%{?dist} +Release: 2%{?gh_date:.%{gh_date}.%{gh_short}}%{?dist} Summary: Zephir language for creation of extensions for PHP. License: MIT @@ -35,6 +35,8 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit # Adapt path used in RPM Patch0: %{gh_project}-rpm.patch +Patch1: https://github.com/phalcon/zephir/commit/8380460c38d4e6d8f00c5596f8ebcd3a6be4f25a.patch +Patch2: https://github.com/phalcon/zephir/commit/650708de9df9039f04eda0fc150bd94e5a5b9753.patch BuildArch: noarch BuildRequires: %{?scl_prefix}php-devel > 7.0 @@ -200,8 +202,9 @@ Compiler design goals: %prep %setup -q -n %{gh_project}-%{gh_commit} -sed -e s'/ZEPHIR_NULL/ZVAL_NULL/' -i kernels/ZendEngine3/string.c %patch0 -p0 -b .rpm +%patch1 -p1 -b .up +%patch2 -p1 -b .up sed -e 's/\$Id\$/%{gh_short}/' \ -i Library/Zephir.php @@ -329,6 +332,9 @@ esac %changelog +* Fri Oct 4 2019 Remi Collet - 0.12.7-2 +- add upstream patches for 1946 and 1949 + * Fri Oct 4 2019 Remi Collet - 0.12.7-1 - update to 0.12.7 - switch to phpunit7 -- cgit