From cfc4a9c05ac8a53ecbe9f7b0bc79db15a3b796a7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 29 Mar 2017 12:11:33 +0200 Subject: add upstream patch for PHP 7.1.4RC1, fix FTBFS detected by Koschei --- php-ast.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'php-ast.spec') diff --git a/php-ast.spec b/php-ast.spec index f750a22..25f5588 100644 --- a/php-ast.spec +++ b/php-ast.spec @@ -24,13 +24,15 @@ Version: 0.1.4 %if 0%{?gh_date:1} Release: 0.2.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %else -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %endif License: BSD Group: Development/Languages URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz +Patch0: 0aa5b47574a6c4e6a034bfdb41a91f4a0699fb9d.patch + BuildRequires: %{?scl_prefix}php-devel > 7 BuildRequires: %{?scl_prefix}php-tokenizer @@ -66,6 +68,8 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO mv %{gh_project}-%{gh_commit} NTS cd NTS +%patch0 -p1 -b .upstream + # Sanity check, really often broken extver=$(sed -n '/#define PHP_AST_VERSION/{s/.* "//;s/".*$//;p}' php_ast.h) if test "x${extver}" != "x%{version}%{?gh_date:-dev}"; then @@ -169,6 +173,9 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Wed Mar 29 2017 Remi Collet - 0.1.4-3 +- add upstream patch for PHP 7.1.4RC1, fix FTBFS detected by Koschei + * Thu Jan 26 2017 Remi Collet - 0.1.4-1 - update to 0.1.4 -- cgit