From 842be679f665ec048b8e5337d804c7c5a4fb9669 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 4 Nov 2022 09:18:06 +0100
Subject: update to 2.0.21

---
 uwsgi-plugin-php.spec | 39 ++++++---------------------------------
 1 file changed, 6 insertions(+), 33 deletions(-)

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

diff --git a/uwsgi-plugin-php.spec b/uwsgi-plugin-php.spec
index acc0da1..27ea16b 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-2020 Remi Collet
+# Copyright (c) 2017-2022 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -28,8 +28,8 @@ Requires: %{scl_prefix}php-embedded
 %endif
 
 Name:          %{?scl_prefix}%{project}-plugin-php
-Version:       2.0.20
-Release:       3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version:       2.0.21
+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
@@ -38,10 +38,6 @@ 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/issues/2356
-Patch2:        uwsgi_fix_php_arginfo.patch
-# https://github.com/unbit/uwsgi/issues/2394
-Patch3:        uwsgi_fix_php81.patch
 Patch4:        uwsgi_fix_php82.patch
 
 BuildRequires: %{?dtsprefix}gcc
@@ -62,30 +58,6 @@ BuildRequires: libargon2-devel
 
 Requires:      %{project}-plugin-common = %{version}
 
-%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
-# Other third party repo stuff
-Obsoletes:     %{project}-plugin-php56u <= %{version}
-Obsoletes:     %{project}-plugin-php70u <= %{version}
-%if "%{php_version}" > "7.1"
-Obsoletes:     %{project}-plugin-php71u <= %{version}
-%endif
-%if "%{php_version}" > "7.2"
-Obsoletes:     %{project}-plugin-php72u <= %{version}
-%endif
-%if "%{php_version}" > "7.3"
-Obsoletes:     %{project}-plugin-php73 <= %{version}
-%endif
-%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
-
 
 %description
 This package contains the PHP plugin for uWSGI,
@@ -97,8 +69,6 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 %prep
 %setup -qn %{project}-%{version}
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 %patch4 -p1
 
 # Fix makefile
@@ -126,6 +96,9 @@ install -Dpm 755 %{?scl}%{!?scl:php}_plugin.so %{buildroot}%{_root_libdir}/%{pro
 
 
 %changelog
+* Fri Nov  4 2022 Remi Collet <remi@remirepo.net> - 2.0.21-1
+- update to 2.0.21
+
 * Mon Oct 17 2022 Remi Collet <remi@remirepo.net> - 2.0.20-3
 - add upstream patch for PHP 8.2
 
-- 
cgit