diff options
Diffstat (limited to 'php-pecl-ds.spec')
| -rw-r--r-- | php-pecl-ds.spec | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/php-pecl-ds.spec b/php-pecl-ds.spec index a1022ae..3e4173e 100644 --- a/php-pecl-ds.spec +++ b/php-pecl-ds.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-ds # -# Copyright (c) 2016-2019 Remi Collet +# Copyright (c) 2016-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -14,9 +14,9 @@ %scl_package php-pecl-ds %global sub_prefix %{scl_prefix} # No phpunit in SCL -%global with_tests 0 +%bcond_with tests %else -%global with_tests 0%{!?_without_tests:1} +%bcond_without tests %endif %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} @@ -25,7 +25,7 @@ %global ini_name 40-%{pecl_name}.ini # For test suite, see https://github.com/php-ds/tests/commits/master -%global gh_commit 31d238c463ff04b5bc8a6015b19be134175be141 +%global gh_commit 5323dffd6130d733b308e53cc8017eb41d278f3a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner php-ds %global gh_project tests @@ -33,11 +33,11 @@ Summary: Data Structures for PHP Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 1.2.9 -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 1.3.0 +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: MIT -URL: http://pecl.php.net/package/%{pecl_name} -Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz +URL: https://pecl.php.net/package/%{pecl_name} +Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz # Only use for tests during the build, no value to be packaged separately # in composer.json: "require-dev": { "php-ds/tests": "dev-master" } Source1: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{gh_short}.tar.gz @@ -47,7 +47,7 @@ BuildRequires: %{?scl_prefix}php-devel >= 7 BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-gmp BuildRequires: %{?scl_prefix}php-json -%if %{with_tests} +%if %{with tests} BuildRequires: %{_bindir}/phpunit6 BuildRequires: %{_bindir}/phpab %endif @@ -66,22 +66,15 @@ 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 "%{php_version}" > "7.1" -Obsoletes: php71u-pecl-%{pecl_name} <= %{version} -Obsoletes: php71w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.2" -Obsoletes: php72u-pecl-%{pecl_name} <= %{version} -Obsoletes: php72w-pecl-%{pecl_name} <= %{version} -%endif +%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} %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 +%if "%{php_version}" > "8.0" +Obsoletes: php80-pecl-%{pecl_name} <= %{version} %endif %endif @@ -216,7 +209,7 @@ cd ../ZTS %endif cd .. -%if %{with_tests} +%if %{with tests} : Generate autoloader for tests %{_bindir}/phpab \ --output tests/autoload.php \ @@ -246,6 +239,9 @@ cd .. %changelog +* Wed Oct 14 2020 Remi Collet <remi@remirepo.net> - 1.3.0-1 +- update to 1.3.0 + * Tue Sep 03 2019 Remi Collet <remi@remirepo.net> - 1.2.9-2 - rebuild for 7.4.0RC1 |