From 391d8bd573a80cc3bbde42caa0f2d3b480dd5d36 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 14 May 2020 09:25:42 +0200 Subject: Patching PHP plugin for 7.4 (from Fedora) --- uwsgi-plugin-php.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/uwsgi-plugin-php.spec b/uwsgi-plugin-php.spec index 545bd6a..38a29ee 100644 --- a/uwsgi-plugin-php.spec +++ b/uwsgi-plugin-php.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for uwsgi-plugin-php # -# Copyright (c) 2017-2019 Remi Collet +# Copyright (c) 2017-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -28,13 +28,16 @@ Requires: %{scl_prefix}php-embedded Name: %{?scl_prefix}%{project}-plugin-php Version: 2.0.18 -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 8%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Summary: uWSGI - Plugin for PHP support License: GPLv2 with exceptions URL: http://projects.unbit.it/uwsgi Source0: http://projects.unbit.it/downloads/%{project}-%{version}.tar.gz +# https://github.com/unbit/uwsgi/pull/2105 +Patch11: uwsgi_fix_php74_zend.patch + BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-embedded @@ -85,6 +88,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %setup -qn %{project}-%{version} +%patch11 -p1 # Fix makefile sed -e 's:/lib:/%{_lib}:' -i plugins/php/uwsgiplugin.py @@ -111,6 +115,9 @@ install -Dpm 755 %{?scl}%{!?scl:php}_plugin.so %{buildroot}%{_root_libdir}/%{pro %changelog +* Thu May 14 2020 Remi Collet - 2.0.18-8 +- Patching PHP plugin for 7.4 + * Tue Sep 03 2019 Remi Collet - 2.0.18-2 - rebuild for 7.4.0RC1 -- cgit