diff options
author | Remi Collet <remi@remirepo.net> | 2021-10-28 14:37:15 +0200 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2021-10-28 14:37:15 +0200 |
commit | 0276c7b2cdad4c051483423c5f2605c4a2e629ce (patch) | |
tree | 9abe4e5cb34e5571b2b0fa35f3b869ab816d9672 /php-pecl-yaml.spec | |
parent | b623b209f09d8802a291e89eb4b2e935782e6dd1 (diff) |
update to 2.2.2
drop patch merged upstream
Diffstat (limited to 'php-pecl-yaml.spec')
-rw-r--r-- | php-pecl-yaml.spec | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/php-pecl-yaml.spec b/php-pecl-yaml.spec index 8e26599..10770c2 100644 --- a/php-pecl-yaml.spec +++ b/php-pecl-yaml.spec @@ -18,20 +18,18 @@ %global pecl_name yaml %global ini_name 40-%{pecl_name}.ini -%global upstream_version 2.2.1 +%global upstream_version 2.2.2 #global upstream_prever b2 Summary: PHP Bindings for yaml Name: %{?sub_prefix}php-pecl-yaml Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 8%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: MIT URL: https://pecl.php.net/package/yaml Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz -Patch0: %{pecl_name}-php81.patch - BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7.1 @@ -54,18 +52,12 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{relea %if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff Obsoletes: php56u-pecl-%{pecl_name} <= %{version} -Obsoletes: php56w-pecl-%{pecl_name} <= %{version} -Obsoletes: php70u-pecl-%{pecl_name} <= %{version} -Obsoletes: php70w-pecl-%{pecl_name} <= %{version} Obsoletes: php71u-pecl-%{pecl_name} <= %{version} -Obsoletes: php71w-pecl-%{pecl_name} <= %{version} %if "%{php_version}" > "7.2" Obsoletes: php72u-pecl-%{pecl_name} <= %{version} -Obsoletes: php72w-pecl-%{pecl_name} <= %{version} %endif %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} @@ -98,8 +90,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -%patch0 -p1 - # Check upstream version (often broken) extver=$(sed -n '/#define PHP_YAML_VERSION/{s/.* "//;s/".*$//;p}' php_yaml.h) if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then @@ -189,11 +179,9 @@ cd NTS --modules | grep '^%{pecl_name}$' : Upstream test suite for NTS extension -TEST_PHP_EXECUTABLE=%{__php} \ TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \ -NO_INTERACTION=1 \ REPORT_EXIT_STATUS=1 \ -%{__php} -n run-tests.php --show-diff +%{__php} -n run-tests.php -q -P --show-diff %if %{with_zts} cd ../ZTS @@ -203,11 +191,9 @@ cd ../ZTS --modules | grep '^%{pecl_name}$' : Upstream test suite for ZTS extension -TEST_PHP_EXECUTABLE=%{__ztsphp} \ TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \ -NO_INTERACTION=1 \ REPORT_EXIT_STATUS=1 \ -%{__ztsphp} -n run-tests.php --show-diff +%{__ztsphp} -n run-tests.php -q -P --show-diff %endif @@ -247,6 +233,10 @@ fi %changelog +* Mon Oct 25 2021 Remi Collet <remi@remirepo.net> - 2.2.2-1 +- update to 2.2.2 +- drop patch merged upstream + * Wed Sep 01 2021 Remi Collet <remi@remirepo.net> - 2.2.1-8 - rebuild for 8.1.0RC1 |