From f248ae8e4297fa01e13b12289d3d280f9a8e45c5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 4 Sep 2023 13:30:55 +0200
Subject: add patch for PHP 8.3 from

  https://github.com/unbit/uwsgi/pull/2559
---
 uwsgi-plugin-php.spec | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'uwsgi-plugin-php.spec')

diff --git a/uwsgi-plugin-php.spec b/uwsgi-plugin-php.spec
index 27ea16b..dce61f2 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,16 +29,18 @@ Requires: %{scl_prefix}php-embedded
 
 Name:          %{?scl_prefix}%{project}-plugin-php
 Version:       2.0.21
-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
-Patch4:        uwsgi_fix_php82.patch
+Patch2:        uwsgi_fix_php82.patch
+# https://github.com/unbit/uwsgi/pull/2559
+Patch3:        uwsgi_fix_php83.patch
 
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel >= 7.0
@@ -68,8 +70,11 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 
 %prep
 %setup -qn %{project}-%{version}
-%patch1 -p1
-%patch4 -p1
+%patch -P1 -p1
+%patch -P2 -p1
+%if "%{php_version}" > "8.3"
+%patch -P3 -p1
+%endif
 
 # Fix makefile
 sed -e 's:/lib:/%{_lib}:' -i plugins/php/uwsgiplugin.py
@@ -96,6 +101,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.21-2
+- add patch for PHP 8.3 from
+  https://github.com/unbit/uwsgi/pull/2559
+
 * Fri Nov  4 2022 Remi Collet <remi@remirepo.net> - 2.0.21-1
 - update to 2.0.21
 
-- 
cgit