From 2c6f8751f322f04232d744d8f177bb4f97a5673b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 24 Jul 2019 09:06:45 +0200 Subject: add patch for 7.4.0beta1 from https://github.com/microsoft/msphpsql/pull/1013 --- php-sqlsrv.spec | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'php-sqlsrv.spec') diff --git a/php-sqlsrv.spec b/php-sqlsrv.spec index b23adb0..c8368b5 100644 --- a/php-sqlsrv.spec +++ b/php-sqlsrv.spec @@ -27,7 +27,7 @@ Name: %{?scl_prefix}php-sqlsrv Summary: Microsoft Drivers for PHP for SQL Server %global tarversion 5.6.1 Version: 5.6.1 -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: MIT URL: https://github.com/Microsoft/msphpsql @@ -38,9 +38,7 @@ Source1: http://pecl.php.net/get/pdo_%{extname}-%{tarversion}.tgz Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz %endif -# workaround for 7.4.0alpha1 -# TODO remove when alpha2 -Patch0: shared.patch +Patch0: https://patch-diff.githubusercontent.com/raw/microsoft/msphpsql/pull/1013.patch BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?dtsprefix}gcc-c++ @@ -130,9 +128,9 @@ mv %{gh_project}-%{gh_commit}/LICENSE . cd NTS cd %{extname} -%patch0 -p0 +%patch0 -p2 cd ../pdo_%{extname} -%patch0 -p0 +%patch0 -p2 cd .. # Sanity check, really often broken @@ -287,6 +285,10 @@ fi %changelog +* Wed Jul 24 2019 Remi Collet - 5.6.1-4 +- add patch for 7.4.0beta1 from + https://github.com/microsoft/msphpsql/pull/1013 + * Fri Jun 14 2019 Remi Collet - 5.6.1-3 - add workaround for 7.4.0alpha1 -- cgit