From 70be0aed5083b4d83e0a5a1f47e0b0868f675b59 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 9 Aug 2022 09:23:40 +0200 Subject: allow msodbcsql18 --- php-sqlsrv.spec | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/php-sqlsrv.spec b/php-sqlsrv.spec index 0ee593d..68433f5 100644 --- a/php-sqlsrv.spec +++ b/php-sqlsrv.spec @@ -21,13 +21,14 @@ %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} # After 20-pdo.ini %global ininame 40-%{extname}.ini -%global msodbcsqlver 17.8 +%global msodbcsqlver17 17.10 +%global msodbcsqlver18 18.1 Name: %{?scl_prefix}php-sqlsrv Summary: Microsoft Drivers for PHP for SQL Server %global tarversion 5.10.1 Version: 5.10.1 -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 URL: https://github.com/Microsoft/msphpsql @@ -43,10 +44,14 @@ BuildRequires: %{?dtsprefix}gcc-c++ BuildRequires: %{?scl_prefix}php-devel >= 7.3 BuildRequires: %{?scl_prefix}php-pdo BuildRequires: %{?scl_prefix}php-pear -BuildRequires: msodbcsql17 >= %{msodbcsqlver} BuildRequires: unixODBC-devel >= 2.3.1 - -Requires: msodbcsql17%{?_isa} >= %{msodbcsqlver} +%if 0%{?fedora} || 0%{?rhel} >= 8 +BuildRequires:(msodbcsql17 >= %{msodbcsqlver17} or msodbcsql18 >= %{msodbcsqlver18}) +Requires: (msodbcsql17%{?_isa} >= %{msodbcsqlver17} or msodbcsql18%{?_isa} >= %{msodbcsqlver18}) +%else +BuildRequires: msodbcsql17 >= %{msodbcsqlver17} +Requires: msodbcsql17%{?_isa} >= %{msodbcsqlver17} +%endif # ABI check Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} @@ -276,6 +281,9 @@ fi %changelog +* Tue Aug 9 2022 Remi Collet - 5.10.1-2 +- allow msodbcsql18 + * Thu May 19 2022 Remi Collet - 5.10.1-1 - update to 5.10.1 - lower minimal PHP version to 7.4 -- cgit