From fbaa4b491c9bc3d2cf71d47cdf09bf6967e719eb Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 4 Sep 2020 14:34:56 +0200
Subject: add patches for PHP 8 from upstream and  
 https://github.com/php-amqp/php-amqp/pull/383

---
 php-pecl-amqp.spec | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

(limited to 'php-pecl-amqp.spec')

diff --git a/php-pecl-amqp.spec b/php-pecl-amqp.spec
index abcc142..a134c73 100644
--- a/php-pecl-amqp.spec
+++ b/php-pecl-amqp.spec
@@ -18,8 +18,9 @@
 %scl_package        php-pecl-amqp
 %endif
 
+%bcond_with tests
+
 %global with_zts    0%{!?_without_zts:%{?__ztsphp:1}}
-%global with_tests  0%{?_with_tests:1}
 %global pecl_name   amqp
 %if "%{php_version}" < "5.6"
 %global ini_name    %{pecl_name}.ini
@@ -33,11 +34,14 @@
 Summary:       Communicate with any AMQP compliant server
 Name:          %{?sub_prefix}php-pecl-amqp
 Version:       1.10.2
-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;')}}
 License:       PHP
 URL:           https://pecl.php.net/package/amqp
 Source0:       https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 
+Patch0:        https://github.com/php-amqp/php-amqp/commit/96cd5cb5eddd3db2faaa3643dad2fe4677d7c438.patch
+Patch1:        https://patch-diff.githubusercontent.com/raw/php-amqp/php-amqp/pull/383.patch
+
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel > 5.6
 BuildRequires: %{?scl_prefix}php-pear
@@ -49,7 +53,7 @@ Requires:      librabbitmq%{?_isa} >= %{buildver}
 BuildRequires: librabbitmq-last-devel   >= 0.8.0
 Requires:      librabbitmq-last%{?_isa} >= %{buildver}
 %endif
-%if %{with_tests}
+%if %{with tests}
 BuildRequires: rabbitmq-server
 %endif
 
@@ -66,33 +70,29 @@ Provides:         %{?scl_prefix}php-pecl-%{pecl_name}          = %{version}-%{re
 Provides:         %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
 %endif
 
-%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
+%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
 # Other third party repo stuff
 Obsoletes:     php54-pecl-%{pecl_name}  <= %{version}
-Obsoletes:     php54w-pecl-%{pecl_name} <= %{version}
 %if "%{php_version}" > "5.6"
 Obsoletes:     php56u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php56w-pecl-%{pecl_name} <= %{version}
 %endif
 %if "%{php_version}" > "7.0"
 Obsoletes:     php70u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php70w-pecl-%{pecl_name} <= %{version}
 %endif
 %if "%{php_version}" > "7.1"
 Obsoletes:     php71u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php71w-pecl-%{pecl_name} <= %{version}
 %endif
 %if "%{php_version}" > "7.2"
 Obsoletes:     php72u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php72w-pecl-%{pecl_name} <= %{version}
 %endif
 %if "%{php_version}" > "7.3"
 Obsoletes:     php73-pecl-%{pecl_name}  <= %{version}
-Obsoletes:     php73w-pecl-%{pecl_name} <= %{version}
 %endif
 %if "%{php_version}" > "7.4"
 Obsoletes:     php74-pecl-%{pecl_name}  <= %{version}
-Obsoletes:     php74w-pecl-%{pecl_name} <= %{version}
+%endif
+%if "%{php_version}" > "8.0"
+Obsoletes:     php80-pecl-%{pecl_name}  <= %{version}
 %endif
 %endif
 
@@ -123,6 +123,9 @@ sed -e 's/role="test"/role="src"/' \
 mv %{pecl_name}-%{version}%{?prever} NTS
 
 cd NTS
+%patch0 -p1 -b .up
+%patch1 -p1 -b .pr383
+
 sed -e 's/CFLAGS="-I/CFLAGS="-fPIC -I/' -i config.m4
 
 # Upstream often forget to change this
@@ -241,7 +244,7 @@ done
     -m | grep %{pecl_name}
 %endif
 
-%if %{with_tests}
+%if %{with tests}
 mkdir log run base
 : Launch the RabbitMQ service
 export RABBITMQ_PID_FILE=$PWD/run/pid
@@ -316,6 +319,10 @@ fi
 
 
 %changelog
+* Fri Sep  4 2020 Remi Collet <remi@remirepo.net> - 1.10.2-2
+- add patches for PHP 8 from upstream and
+  https://github.com/php-amqp/php-amqp/pull/383
+
 * Mon Apr  6 2020 Remi Collet <remi@remirepo.net> - 1.10.2-1
 - update to 1.10.2
 
-- 
cgit