diff options
| -rw-r--r-- | 95.patch | 22 | ||||
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-pecl-yaml.spec | 26 |
4 files changed, 18 insertions, 34 deletions
diff --git a/95.patch b/95.patch deleted file mode 100644 index fbb37e4..0000000 --- a/95.patch +++ /dev/null @@ -1,22 +0,0 @@ -From e8069a1fcc62328410812acf9dccf656e7c7c5fd Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Sat, 27 Sep 2025 15:45:16 +0200 -Subject: [PATCH] avoid unexpected NAN value was coerced to string - ---- - tests/bug_79866.phpt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/bug_79866.phpt b/tests/bug_79866.phpt -index 2189b90..6dbc813 100644 ---- a/tests/bug_79866.phpt -+++ b/tests/bug_79866.phpt -@@ -29,7 +29,7 @@ $floats = [ - foreach( $floats as $idx => $float ) { - $float = floatval($float); - ob_start(); -- echo $float; -+ @print_r($float); - $native = ob_get_clean(); - - $expect = "--- {$native}\n...\n"; @@ -2,7 +2,7 @@ yaml LibYAML Support => enabled -Module Version => 2.2.5 +Module Version => 2.3.0 LibYAML Version => 0.2.5 Directive => Local Value => Master Value @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #127 yaml version 2.2.5 ] { +Extension [ <persistent> extension #135 yaml version 2.3.0 ] { - Dependencies { Dependency [ date (Optional) ] diff --git a/php-pecl-yaml.spec b/php-pecl-yaml.spec index c3c9b91..a514d39 100644 --- a/php-pecl-yaml.spec +++ b/php-pecl-yaml.spec @@ -15,9 +15,11 @@ %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global pecl_name yaml +%global pie_vend pecl +%global pie_proj yaml %global ini_name 40-%{pecl_name}.ini -%global upstream_version 2.2.5 +%global upstream_version 2.3.0 #global upstream_prever b2 %global sources %{pecl_name}-%{upstream_version}%{?upstream_prever} %global _configure ../%{sources}/configure @@ -25,14 +27,12 @@ Summary: PHP Bindings for yaml Name: %{?scl_prefix}php-pecl-yaml Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 3%{?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: https://patch-diff.githubusercontent.com/raw/php/pecl-file_formats-yaml/pull/95.patch - ExcludeArch: %{ix86} BuildRequires: make @@ -44,10 +44,14 @@ BuildRequires: libyaml-devel Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} -Provides: %{?scl_prefix}php-%{pecl_name} = %{version} -Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} -Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} -Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} +# Extension +Provides: %{?scl_prefix}php-%{pecl_name} = %{version} +Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} +# PECL +Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} +Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} +# PIE +Provides: %{?scl_prefix}php-pie(%{pie_vend}/%{pie_proj}) = %{version} %description @@ -68,8 +72,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd %{sources} -%patch -P0 -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 @@ -201,6 +203,10 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Wed Nov 12 2025 Remi Collet <remi@remirepo.net> - 2.3.0-1 +- update to 2.3.0 +- drop patch merged upstream + * Sat Sep 27 2025 Remi Collet <remi@remirepo.net> - 2.2.5-3 - add patch for PHP 8.5.0RC1 from https://github.com/php/pecl-file_formats-yaml/pull/95 |