From a8a769712ab226db4557844ab0a1a70fd50ee39c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 14 Feb 2022 10:29:31 +0100 Subject: update to 2.0.20 --- uwsgi-plugin-php.spec | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) (limited to 'uwsgi-plugin-php.spec') diff --git a/uwsgi-plugin-php.spec b/uwsgi-plugin-php.spec index 38a29ee..63134f1 100644 --- a/uwsgi-plugin-php.spec +++ b/uwsgi-plugin-php.spec @@ -12,6 +12,7 @@ # Disable RPATH check %global __arch_install_post /bin/true +%global __brp_check_rpaths /bin/true # Disable auto-provides (php_plugin.so is not a library) AutoProv: 0 @@ -27,19 +28,21 @@ Requires: %{scl_prefix}php-embedded %endif Name: %{?scl_prefix}%{project}-plugin-php -Version: 2.0.18 -Release: 8%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 2.0.20 +Release: 1%{?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 +# https://github.com/unbit/uwsgi/issues/2283 +Patch1: uwsgi_fix_php8.patch +# https://github.com/unbit/uwsgi/issues/2356 +Patch2: uwsgi_fix_php_arginfo.patch BuildRequires: %{?dtsprefix}gcc -BuildRequires: %{?scl_prefix}php-devel +BuildRequires: %{?scl_prefix}php-devel >= 7.0 BuildRequires: %{?scl_prefix}php-embedded BuildRequires: %{project}-devel = %{version} BuildRequires: bzip2-devel @@ -56,7 +59,7 @@ BuildRequires: libargon2-devel Requires: %{project}-plugin-common = %{version} -%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} +%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff %if "%{php_version}" > "5.6" Obsoletes: %{project}-plugin-php56u <= %{version} @@ -76,6 +79,12 @@ Obsoletes: %{project}-plugin-php73 <= %{version} %if "%{php_version}" > "7.4" Obsoletes: %{project}-plugin-php74 <= %{version} %endif +%if "%{php_version}" > "8.0" +Obsoletes: %{project}-plugin-php80 <= %{version} +%endif +%if "%{php_version}" > "8.1" +Obsoletes: %{project}-plugin-php81 <= %{version} +%endif %endif @@ -88,7 +97,8 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %setup -qn %{project}-%{version} -%patch11 -p1 +%patch1 -p1 +%patch2 -p1 # Fix makefile sed -e 's:/lib:/%{_lib}:' -i plugins/php/uwsgiplugin.py @@ -115,6 +125,9 @@ install -Dpm 755 %{?scl}%{!?scl:php}_plugin.so %{buildroot}%{_root_libdir}/%{pro %changelog +* Mon Feb 14 2022 Remi Collet - 2.0.20-1 +- update to 2.0.20 + * Thu May 14 2020 Remi Collet - 2.0.18-8 - Patching PHP plugin for 7.4 -- cgit