From 82bd378b68cd35d6bd5f3c31f762bfdb864e118b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 19 Aug 2020 15:34:36 +0200 Subject: add upstream patch for GCC 10 --- php-pecl-seasclick.spec | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'php-pecl-seasclick.spec') diff --git a/php-pecl-seasclick.spec b/php-pecl-seasclick.spec index 58c0578..d9ca34e 100644 --- a/php-pecl-seasclick.spec +++ b/php-pecl-seasclick.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-seasclick # -# Copyright (c) 2019 Remi Collet +# Copyright (c) 2019-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -28,12 +28,13 @@ Summary: An Yandex ClickHouse client driven extension for PHP Name: %{?sub_prefix}php-pecl-%{lowername} Version: 0.1.0 -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: ASL 2.0 -URL: http://pecl.php.net/package/%{proj_name} -Source0: http://pecl.php.net/get/%{proj_name}-%{version}.tgz +URL: https://pecl.php.net/package/%{proj_name} +Source0: https://pecl.php.net/get/%{proj_name}-%{version}.tgz Patch0: https://github.com/SeasX/SeasClick/commit/fe089abf1a34a1ae5575bd7cc8b9bfa9a6605e16.patch +Patch1: https://github.com/SeasX/SeasClick/commit/e05a2b595d32d2b9a210a6f6afbed490f2d23148.patch %if 0%{?rhel} == 6 BuildRequires: devtoolset-6-toolchain @@ -58,7 +59,7 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{rele Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} %endif -%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} +%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff %if "%{php_version}" > "7.1" Obsoletes: php71u-pecl-%{pecl_name} <= %{version} @@ -102,7 +103,8 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -%patch0 -p1 -b .up +%patch0 -p1 -b .up0 +%patch1 -p1 -b .up1 : Sanity check, really often broken extver=$(sed -n '/#define PHP_SEASCLICK_VERSION /{s/.* "//;s/".*$//;p}' php_SeasClick.h) @@ -226,6 +228,9 @@ fi %changelog +* Wed Aug 19 2020 Remi Collet - 0.1.0-4 +- add upstream patch for GCC 10 + * Tue Sep 03 2019 Remi Collet - 0.1.0-3 - rebuild for 7.4.0RC1 -- cgit