summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-06-09 16:21:57 +0200
committerRemi Collet <remi@php.net>2022-06-09 16:21:57 +0200
commit9b562493bca17012f082ef94685935e71174bb38 (patch)
tree37f1741b7b7c68a18b18cc9eca1f0ebad49b19ca
parenta8a769712ab226db4557844ab0a1a70fd50ee39c (diff)
add upstream patch for PHP 8.1
-rw-r--r--uwsgi-plugin-php.spec12
1 files changed, 7 insertions, 5 deletions
diff --git a/uwsgi-plugin-php.spec b/uwsgi-plugin-php.spec
index 63134f1..b579071 100644
--- a/uwsgi-plugin-php.spec
+++ b/uwsgi-plugin-php.spec
@@ -29,7 +29,7 @@ Requires: %{scl_prefix}php-embedded
Name: %{?scl_prefix}%{project}-plugin-php
Version: 2.0.20
-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
URL: http://projects.unbit.it/uwsgi
@@ -40,6 +40,8 @@ Source0: http://projects.unbit.it/downloads/%{project}-%{version}.tar.gz
Patch1: uwsgi_fix_php8.patch
# https://github.com/unbit/uwsgi/issues/2356
Patch2: uwsgi_fix_php_arginfo.patch
+# https://github.com/unbit/uwsgi/issues/2394
+Patch3: uwsgi_fix_php81.patch
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel >= 7.0
@@ -61,12 +63,8 @@ Requires: %{project}-plugin-common = %{version}
%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
# Other third party repo stuff
-%if "%{php_version}" > "5.6"
Obsoletes: %{project}-plugin-php56u <= %{version}
-%endif
-%if "%{php_version}" > "7.0"
Obsoletes: %{project}-plugin-php70u <= %{version}
-%endif
%if "%{php_version}" > "7.1"
Obsoletes: %{project}-plugin-php71u <= %{version}
%endif
@@ -99,6 +97,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
%setup -qn %{project}-%{version}
%patch1 -p1
%patch2 -p1
+%patch3 -p1
# Fix makefile
sed -e 's:/lib:/%{_lib}:' -i plugins/php/uwsgiplugin.py
@@ -125,6 +124,9 @@ install -Dpm 755 %{?scl}%{!?scl:php}_plugin.so %{buildroot}%{_root_libdir}/%{pro
%changelog
+* Thu Jun 9 2022 Remi Collet <remi@remirepo.net> - 2.0.20-2
+- add upstream patch for PHP 8.1
+
* Mon Feb 14 2022 Remi Collet <remi@remirepo.net> - 2.0.20-1
- update to 2.0.20