diff options
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-pecl-yaml.spec | 28 | ||||
| -rw-r--r-- | yaml-build.patch | 22 |
4 files changed, 20 insertions, 34 deletions
@@ -2,7 +2,7 @@ yaml LibYAML Support => enabled -Module Version => 2.2.3 +Module Version => 2.2.4 LibYAML Version => 0.2.5 Directive => Local Value => Master Value @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #106 yaml version 2.2.3 ] { +Extension [ <persistent> extension #108 yaml version 2.2.4 ] { - Dependencies { Dependency [ date (Optional) ] diff --git a/php-pecl-yaml.spec b/php-pecl-yaml.spec index d724e77..3a88b6b 100644 --- a/php-pecl-yaml.spec +++ b/php-pecl-yaml.spec @@ -17,7 +17,7 @@ %global pecl_name yaml %global ini_name 40-%{pecl_name}.ini -%global upstream_version 2.2.3 +%global upstream_version 2.2.4 #global upstream_prever b2 %global sources %{pecl_name}-%{upstream_version}%{?upstream_prever} %global _configure ../%{sources}/configure @@ -25,14 +25,12 @@ Summary: PHP Bindings for yaml Name: %{?scl_prefix}php-pecl-yaml Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 4%{?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}-build.patch - ExcludeArch: %{ix86} BuildRequires: make @@ -68,8 +66,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 @@ -113,26 +109,30 @@ mkdir NTS ZTS cd %{sources} %{__phpize} +[ -f Makefile.global ] && GLOBAL=Makefile.global || GLOBAL=build/Makefile.global +sed -e 's/INSTALL_ROOT/DESTDIR/' -i $GLOBAL cd ../NTS %configure \ --with-libdir=%{_lib} \ --with-php-config=%{__phpconfig} -make %{?_smp_mflags} + +%make_build %if %{with_zts} cd ../ZTS %configure \ --with-libdir=%{_lib} \ --with-php-config=%{__ztsphpconfig} -make %{?_smp_mflags} + +%make_build %endif %install %{?dtsenable} -make -C NTS install INSTALL_ROOT=%{buildroot} +%make_install -C NTS # Install XML package description install -Dpm 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml @@ -141,7 +141,7 @@ install -Dpm 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml install -Dpm644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} %if %{with_zts} -make -C ZTS install INSTALL_ROOT=%{buildroot} +%make_install -C ZTS install -Dpm644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} %endif @@ -197,6 +197,14 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Mon Oct 7 2024 Remi Collet <remi@remirepo.net> - 2.2.4-1 +- update to 2.2.4 +- drop patches merged upstream + +* Mon Sep 30 2024 Remi Collet <remi@remirepo.net> - 2.2.3-5 +- fix test suite with 8.4 using patch from + https://github.com/php/pecl-file_formats-yaml/pull/86 + * Mon Feb 19 2024 Remi Collet <remi@remirepo.net> - 2.2.3-4 - fix incompatible-pointer-types using patch from https://github.com/php/pecl-file_formats-yaml/pull/74 diff --git a/yaml-build.patch b/yaml-build.patch deleted file mode 100644 index 4f74086..0000000 --- a/yaml-build.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 84d72fcdcf64f39a55a262db23b64b0b58b08a17 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Mon, 6 Mar 2023 09:29:07 +0100 -Subject: [PATCH] Fix [-Wincompatible-pointer-types] warning - ---- - parse.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/parse.c b/parse.c -index e63f3d8..17f70ba 100644 ---- a/parse.c -+++ b/parse.c -@@ -531,7 +531,7 @@ void handle_sequence (parser_state_t *state, zval *retval) { - /* apply callbacks to the collected node */ - if (Y_FILTER_FAILURE == apply_filter( - retval, src_event, state->callbacks)) { -- zval_ptr_dtor(&retval); -+ zval_ptr_dtor(retval); - ZVAL_UNDEF(retval); - goto done; - //TODO Sean-Der |