diff options
| -rw-r--r-- | 295.patch | 49 | ||||
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-noisebynorthwest-php-spx.spec | 26 |
4 files changed, 15 insertions, 64 deletions
diff --git a/295.patch b/295.patch deleted file mode 100644 index fbaae6b..0000000 --- a/295.patch +++ /dev/null @@ -1,49 +0,0 @@ -From e77fc1d145337b92d4ad940bdb212554e97eba62 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Mon, 30 Jun 2025 11:25:34 +0200 -Subject: [PATCH] Fix #294 add --with-spx-assets-dir configure options - ---- - Makefile.frag | 9 +++------ - config.m4 | 7 +++++++ - 2 files changed, 10 insertions(+), 6 deletions(-) - -diff --git a/Makefile.frag b/Makefile.frag -index 9f3ae0b..c899753 100644 ---- a/Makefile.frag -+++ b/Makefile.frag -@@ -1,11 +1,8 @@ - --spx_ui_assets_dir = $(INSTALL_ROOT)$(prefix)/share/misc/php-spx/assets/web-ui -- --CFLAGS += -DSPX_HTTP_UI_ASSETS_DIR=\"$(spx_ui_assets_dir)\" - - install-spx-ui-assets: -- @echo "Installing SPX web UI to: $(spx_ui_assets_dir)" -- @mkdir -p $(spx_ui_assets_dir) -- @cp -r assets/web-ui/* $(spx_ui_assets_dir) -+ @echo "Installing SPX web UI to: $(INSTALL_ROOT)$(PHP_SPX_ASSETS_DIR)/web-ui" -+ @mkdir -p $(INSTALL_ROOT)$(PHP_SPX_ASSETS_DIR)/web-ui -+ @cp -r assets/web-ui/* $(INSTALL_ROOT)$(PHP_SPX_ASSETS_DIR)/web-ui - - install: $(all_targets) $(install_targets) install-spx-ui-assets -diff --git a/config.m4 b/config.m4 -index e6fc9a1..2e8d7bd 100644 ---- a/config.m4 -+++ b/config.m4 -@@ -9,8 +9,15 @@ PHP_ARG_WITH(zlib-dir, for ZLIB, - [ --with-zlib-dir[=DIR] Set the path to ZLIB install prefix.], no) - fi - -+PHP_ARG_WITH(spx-assets-dir, for assets path, -+[ --with-spx-assets-dir[=DIR] Set the installation path of assets.], $prefix/share/misc/php-spx/assets) -+ - if test "$PHP_SPX" = "yes"; then - AC_DEFINE(HAVE_SPX, 1, [spx]) -+ AC_MSG_CHECKING([for assets directory]) -+ AC_MSG_RESULT([ $PHP_SPX_ASSETS_DIR ]) -+ AC_DEFINE_UNQUOTED([SPX_HTTP_UI_ASSETS_DIR], [ "$PHP_SPX_ASSETS_DIR/web-ui" ], [path of web-ui assets directory]) -+ PHP_SUBST([PHP_SPX_ASSETS_DIR]) - - CFLAGS="-Werror -Wall -O3 -pthread -std=gnu90" - @@ -2,7 +2,7 @@ SPX SPX Support => enabled -SPX Version => 0.4.19 +SPX Version => 0.4.20 Directive => Local Value => Master Value spx.debug => 0 => 0 @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #140 SPX version 0.4.19 ] { +Extension [ <persistent> extension #142 SPX version 0.4.20 ] { - INI { Entry [ spx.debug <SYSTEM> ] diff --git a/php-noisebynorthwest-php-spx.spec b/php-noisebynorthwest-php-spx.spec index 1f49d36..b556c16 100644 --- a/php-noisebynorthwest-php-spx.spec +++ b/php-noisebynorthwest-php-spx.spec @@ -14,7 +14,7 @@ # Extension %global ext_name spx %global ini_name 40-%{ext_name}.ini -%global upstream_version 0.4.19 +%global upstream_version 0.4.20 #global upstream_prever RC1 # PIE / packagist %global pie_vend noisebynorthwest @@ -23,7 +23,7 @@ %global gh_vend NoiseByNorthwest %global gh_proj php-spx %global forgeurl https://github.com/%{gh_vend}/%{gh_proj} -#global commit b3ae87353da524f33374ee0418ad48f704bb6af1 +#global commit afe5de4ce52bb2b80af565a6f297bf330a65d0d8 %global tag v%{upstream_version}%{?upstream_prever} # for EL-8 to avoid TAG usage %global archivename %{gh_proj}-%{upstream_version}%{?upstream_prever} @@ -32,16 +32,15 @@ Summary: PHP profiling extension Name: %{?scl_prefix}php-%{pie_vend}-%{pie_proj} Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} %forgemeta -Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} -# GPL-3.0-only: php-spx -# GPL-3.0-or-later: jscolor.js dataTable.js fmt.js layoutSplitter.js math.js profileData.js svg.js utils.js widget.js +Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +# See THIRD-PARTY-LICENSES.md +# GPL-3.0-or-later: php-spx and *.js +# GPL-3.0-only: jscolor.js # MIT: jquery -License: GPL-3.0-only AND GPL-3.0-or-later AND MIT +License: GPL-3.0-or-later AND GPL-3.0-only AND MIT URL: %{forgeurl} Source0: %{forgesource} -Patch0: https://patch-diff.githubusercontent.com/raw/NoiseByNorthwest/php-spx/pull/295.patch - BuildRequires: make BuildRequires: gcc BuildRequires: zlib-devel @@ -92,8 +91,6 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %forgesetup -%patch -P0 -p1 - : Sanity check, really often broken extver=$(sed -n '/#define PHP_SPX_VERSION/{s/.* "//;s/".*$//;p}' src/php_spx.h) if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then @@ -121,9 +118,8 @@ extension=%{ext_name}.so ;spx.http_profiling_metrics = EOF -: RPM build options and layout +: RPM build options sed -e 's/CFLAGS/IGNORED_CFLAGS/' -i config.m4 -sed -e 's:misc/php-spx:%{name}:' -i Makefile.frag %build %{__phpize} @@ -161,7 +157,7 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}/%{php_extdir}/%{ext_name}.so" \ %files -%license LICENSE +%license LICENSE THIRD-PARTY-LICENSES.md %doc composer.json %doc *.md %config(noreplace) %{php_inidir}/%{ini_name} @@ -170,6 +166,10 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}/%{php_extdir}/%{ext_name}.so" \ %changelog +* Thu Jul 3 2025 Remi Collet <remi@remirepo.net> - 0.4.20-1 +- update to 0.4.20 +- drop patch merged upstream + * Mon Jun 30 2025 Remi Collet <remi@remirepo.net> - 0.4.19-2 - test build for https://github.com/NoiseByNorthwest/php-spx/pull/295 add --with-spx-assets-dir configure option |