diff options
| author | Remi Collet <remi@remirepo.net> | 2019-07-09 09:17:21 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-07-09 09:17:21 +0200 |
| commit | 3abb79ec386c98c43eaf2681948760ac1774dbe1 (patch) | |
| tree | fcc1d85896da27730a4940923515e0315806c315 /php-pecl-mysql-xdevapi.spec | |
| parent | 185e6553ea299fb7aa88cafee3a2a4d07e4054fb (diff) | |
- add patch for PHP 7.4 from
https://github.com/php/pecl-database-mysql_xdevapi/pull/6
https://github.com/php/pecl-database-mysql_xdevapi/pull/7
Diffstat (limited to 'php-pecl-mysql-xdevapi.spec')
| -rw-r--r-- | php-pecl-mysql-xdevapi.spec | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/php-pecl-mysql-xdevapi.spec b/php-pecl-mysql-xdevapi.spec index 0269670..8e12477 100644 --- a/php-pecl-mysql-xdevapi.spec +++ b/php-pecl-mysql-xdevapi.spec @@ -25,12 +25,15 @@ Summary: MySQL database access functions Name: %{?sub_prefix}php-pecl-mysql-xdevapi Version: 8.0.16 -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: PHP URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz +Patch0: https://patch-diff.githubusercontent.com/raw/php/pecl-database-mysql_xdevapi/pull/6.patch +Patch1: https://patch-diff.githubusercontent.com/raw/php/pecl-database-mysql_xdevapi/pull/7.patch + BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?dtsprefix}gcc-c++ BuildRequires: %{?scl_prefix}php-devel > 7.1 @@ -73,10 +76,14 @@ Obsoletes: php71w-pecl-%{pecl_name} <= %{version} Obsoletes: php72u-pecl-%{pecl_name} <= %{version} Obsoletes: php72w-pecl-%{pecl_name} <= %{version} %endif -%if "%{php_version}" > "7.2" -Obsoletes: php73u-pecl-%{pecl_name} <= %{version} +%if "%{php_version}" > "7.3" +Obsoletes: php73-pecl-%{pecl_name} <= %{version} Obsoletes: php73w-pecl-%{pecl_name} <= %{version} %endif +%if "%{php_version}" > "7.4" +Obsoletes: php74-pecl-%{pecl_name} <= %{version} +Obsoletes: php74w-pecl-%{pecl_name} <= %{version} +%endif %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -125,6 +132,9 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS +%patch0 -p1 -b .pr6 +%patch1 -p1 -b .pr7 + # Check version as upstream often forget to update this extver=$(sed -n '/#define PHP_MYSQL_XDEVAPI_VERSION/{s/.* "//;s/".*$//;p}' php_mysql_xdevapi.h) if test "x${extver}" != "x%{version}%{?prever}%{?gh_date:-dev}"; then @@ -312,6 +322,11 @@ fi %changelog +* Tue Jul 9 2019 Remi Collet <remi@remirepo.net> - 8.0.16-2 +- add patch for PHP 7.4 from + https://github.com/php/pecl-database-mysql_xdevapi/pull/6 + https://github.com/php/pecl-database-mysql_xdevapi/pull/7 + * Thu Apr 25 2019 Remi Collet <remi@remirepo.net> - 8.0.16-1 - update to 8.0.16 |