diff options
| author | Remi Collet <remi@remirepo.net> | 2021-04-08 08:31:57 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2021-04-08 08:31:57 +0200 |
| commit | 7c9a68eefa7934bb408b978419939f95c9fed238 (patch) | |
| tree | b6fc7293496f7d97ab38ba6ecc252acfadef6399 | |
| parent | 23192a53300e11f674a392f856486971e7fbd1d0 (diff) | |
rebuild against dlib 19.22
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | php-pdlib.spec | 25 |
2 files changed, 11 insertions, 16 deletions
@@ -3,7 +3,7 @@ pdlib pdlib support => enabled pdlib extension version => 1.0.2 -dlib library version => 19.21.0 +dlib library version => 19.22.0 DLIB_USE_CUDA => false DLIB_USE_BLAS => true DLIB_USE_LAPACK => true diff --git a/php-pdlib.spec b/php-pdlib.spec index 5bbfd27..b5a12c4 100644 --- a/php-pdlib.spec +++ b/php-pdlib.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pdlib # -# Copyright (c) 2020 Remi Collet +# Copyright (c) 2020-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -23,11 +23,6 @@ %global ini_name 40-%{pecl_name}.ini %if ! 0%{?dtsversion} -%if 0%{?rhel} == 6 -%global dtsenable export PHP_AUTOCONF=autoconf268;export PHP_AUTOHEADER=autoheader268;source /opt/rh/devtoolset-7/enable -BuildRequires: devtoolset-7-toolchain -BuildRequires: autoconf268 -%endif %if 0%{?rhel} == 7 %global dtsenable source /opt/rh/devtoolset-7/enable BuildRequires: devtoolset-7-toolchain @@ -40,7 +35,7 @@ Version: 1.0.2 %if 0%{?gh_date:1} Release: 2%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %else -Release: 5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 6%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %endif License: MIT URL: https://github.com/%{gh_owner}/%{gh_project} @@ -48,8 +43,8 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit} Patch0: https://patch-diff.githubusercontent.com/raw/goodspb/pdlib/pull/37.patch -BuildRequires: %{?scl_prefix}php-devel > 7 -BuildRequires: dlib-devel >= 19.21 +BuildRequires: %{?scl_prefix}php-devel >= 7.0 +BuildRequires: dlib-devel >= 19.22 Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} @@ -57,17 +52,14 @@ Requires: %{?scl_prefix}php(api) = %{php_core_api} %if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff -%if "%{php_version}" > "7.2" -Obsoletes: php72u-%{pecl_name} <= %{version} -Obsoletes: php72w-%{pecl_name} <= %{version} -%endif %if "%{php_version}" > "7.3" Obsoletes: php73-%{pecl_name} <= %{version} -Obsoletes: php73w-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.4" Obsoletes: php74-%{pecl_name} <= %{version} -Obsoletes: php74w-%{pecl_name} <= %{version} +%endif +%if "%{php_version}" > "8.0" +Obsoletes: php80-%{pecl_name} <= %{version} %endif %endif @@ -193,6 +185,9 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ %changelog +* Thu Apr 8 2021 Remi Collet <remi@remirepo.net> - 1.0.2-6 +- rebuild against dlib 19.22 + * Wed Sep 30 2020 Remi Collet <remi@remirepo.net> - 1.0.2-5 - rebuild for PHP 8.0.0RC1 - add patch for PHP 8.0.0rc1 from |