diff options
| author | Remi Collet <remi@remirepo.net> | 2024-07-05 15:50:05 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2024-07-05 15:50:05 +0200 |
| commit | 70c6bdf13f754797a27a0ef31efce21ea0c23c5b (patch) | |
| tree | 1884714bd9eea20176a666cf6afbc1db57563787 /php-pecl-xhprof.spec | |
| parent | 011e663fc440bfb07bb25ccdd7b8c731f712397a (diff) | |
fix build with 8.4 using patch from
https://github.com/longxinH/xhprof/pull/87
Diffstat (limited to 'php-pecl-xhprof.spec')
| -rw-r--r-- | php-pecl-xhprof.spec | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/php-pecl-xhprof.spec b/php-pecl-xhprof.spec index a754031..53e5007 100644 --- a/php-pecl-xhprof.spec +++ b/php-pecl-xhprof.spec @@ -3,7 +3,7 @@ # # Fedora spec file for php-pecl-xhprof # -# Copyright (c) 2012-2023 Remi Collet +# Copyright (c) 2012-2024 Remi Collet # License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -27,13 +27,15 @@ Name: %{?scl_prefix}php-pecl-xhprof Version: 2.3.9 -Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Summary: PHP extension for XHProf, a Hierarchical Profiler License: Apache-2.0 URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{sources}.tgz +Patch0: 87.patch + # https://bugs.php.net/61262 ExclusiveArch: %{ix86} x86_64 aarch64 @@ -96,10 +98,12 @@ Documentation: %{pecl_docdir}/%{pecl_name}/xhprof_html/docs/index.html # xhprof_html should be web, but www_dir is /var/www/html # xhprof_lib should be php, really a lib sed -e 's/role="php"/role="src"/' \ - %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ + -e '/LICENSE/s/role="doc"/role="src"/' \ -i package.xml pushd %{sources}/extension +%patch -P0 -p2 + sed -e '/XHPROF_VERSION/s/2.3.5/%{version}/' -i php_xhprof.h # Sanity check, really often broken extver=$(sed -n '/#define XHPROF_VERSION/{s/.* "//;s/".*$//;p}' php_xhprof.h) @@ -218,28 +222,8 @@ REPORT_EXIT_STATUS=1 \ %endif -%if 0%{?fedora} < 24 && 0%{?rhel} < 8 -# when pear installed alone, after us -%triggerin -- %{?scl_prefix}php-pear -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -# posttrans as pear can be installed after us -%posttrans -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -%postun -if [ $1 -eq 0 -a -x %{__pecl} ] ; then - %{pecl_uninstall} %{pecl_name} >/dev/null || : -fi -%endif - - %files -%{?_licensedir:%license %{sources}/LICENSE} +%license %{sources}/LICENSE %doc %{pecl_docdir}/%{pecl_name} %exclude %{pecl_docdir}/%{pecl_name}/examples %exclude %{pecl_docdir}/%{pecl_name}/xhprof_html @@ -263,6 +247,10 @@ fi %changelog +* Fri Jul 5 2024 Remi Collet <remi@remirepo.net> - 2.3.9-4 +- fix build with 8.4 using patch from + https://github.com/longxinH/xhprof/pull/87 + * Wed Aug 30 2023 Remi Collet <remi@remirepo.net> - 2.3.9-3 - rebuild for PHP 8.3.0RC1 |