summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2023-09-04 13:27:21 +0200
committerRemi Collet <remi@php.net>2023-09-04 13:27:21 +0200
commitd987a6b1a86dd5a44935de01f74cf20dccc5081d (patch)
treed84e3677d2eb019a42f06133371c5893b70c5c4e
parentb44ebed360a81cd8ca341e47f752ca84d6598fa1 (diff)
add patch for PHP 8.3 from
https://github.com/unbit/uwsgi/pull/2559
-rw-r--r--uwsgi-plugin-php.spec17
1 files changed, 13 insertions, 4 deletions
diff --git a/uwsgi-plugin-php.spec b/uwsgi-plugin-php.spec
index d336a2f..5561286 100644
--- a/uwsgi-plugin-php.spec
+++ b/uwsgi-plugin-php.spec
@@ -1,7 +1,7 @@
# remirepo/fedora spec file for uwsgi-plugin-php
#
-# Copyright (c) 2017-2022 Remi Collet
-# License: CC-BY-SA
+# Copyright (c) 2017-2023 Remi Collet
+# License: CC-BY-SA-4.0
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
@@ -29,15 +29,17 @@ Requires: %{scl_prefix}php-embedded
Name: %{?scl_prefix}%{project}-plugin-php
Version: 2.0.22
-Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
Summary: uWSGI - Plugin for PHP support
-License: GPLv2 with exceptions
+License: GPL-2.0-only with exceptions
URL: http://projects.unbit.it/uwsgi
Source0: http://projects.unbit.it/downloads/%{project}-%{version}.tar.gz
# https://github.com/unbit/uwsgi/issues/2283
Patch1: uwsgi_fix_php8.patch
+# https://github.com/unbit/uwsgi/pull/2559
+Patch2: uwsgi_fix_php83.patch
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel >= 7.0
@@ -68,6 +70,9 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
%prep
%setup -qn %{project}-%{version}
%patch -P1 -p1
+%if "%{php_version}" > "8.3"
+%patch -P2 -p1
+%endif
# Fix makefile
sed -e 's:/lib:/%{_lib}:' -i plugins/php/uwsgiplugin.py
@@ -94,6 +99,10 @@ install -Dpm 755 %{?scl}%{!?scl:php}_plugin.so %{buildroot}%{_root_libdir}/%{pro
%changelog
+* Mon Sep 4 2023 Remi Collet <remi@remirepo.net> - 2.0.22-2
+- add patch for PHP 8.3 from
+ https://github.com/unbit/uwsgi/pull/2559
+
* Thu Aug 17 2023 Remi Collet <remi@remirepo.net> - 2.0.22-1
- update to 2.0.22