summaryrefslogtreecommitdiffstats
path: root/php-noisebynorthwest-php-spx.spec
diff options
context:
space:
mode:
Diffstat (limited to 'php-noisebynorthwest-php-spx.spec')
-rw-r--r--php-noisebynorthwest-php-spx.spec26
1 files changed, 13 insertions, 13 deletions
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