From 662989c1effa5d0e4f15236d0852ed98586ecbc8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 17 Jul 2018 17:43:19 +0200 Subject: add patch for PHP 7.3 from + https://github.com/pdezwart/php-amqp/pull/323 --- php-pecl-amqp.spec | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'php-pecl-amqp.spec') diff --git a/php-pecl-amqp.spec b/php-pecl-amqp.spec index ea23952..fac4f4d 100644 --- a/php-pecl-amqp.spec +++ b/php-pecl-amqp.spec @@ -33,13 +33,14 @@ Summary: Communicate with any AMQP compliant server Name: %{?sub_prefix}php-pecl-amqp Version: 1.9.3 -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP -Group: Development/Languages URL: http://pecl.php.net/package/amqp Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz -BuildRequires: %{?dtsprefix}gcc +Patch0: https://patch-diff.githubusercontent.com/raw/pdezwart/php-amqp/pull/323.patch + +BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel > 5.3 BuildRequires: %{?scl_prefix}php-pear #BuildRequires: php-debuginfo valgrind gdb @@ -70,14 +71,8 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{re %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff -Obsoletes: php53-pecl-%{pecl_name} <= %{version} -Obsoletes: php53u-pecl-%{pecl_name} <= %{version} Obsoletes: php54-pecl-%{pecl_name} <= %{version} Obsoletes: php54w-pecl-%{pecl_name} <= %{version} -%if "%{php_version}" > "5.5" -Obsoletes: php55u-pecl-%{pecl_name} <= %{version} -Obsoletes: php55w-pecl-%{pecl_name} <= %{version} -%endif %if "%{php_version}" > "5.6" Obsoletes: php56u-pecl-%{pecl_name} <= %{version} Obsoletes: php56w-pecl-%{pecl_name} <= %{version} @@ -123,6 +118,8 @@ sed -e 's/role="test"/role="src"/' \ mv %{pecl_name}-%{version}%{?prever} NTS cd NTS +%patch0 -p1 -b .pr323 + sed -e 's/CFLAGS="-I/CFLAGS="-fPIC -I/' -i config.m4 # Upstream often forget to change this @@ -311,6 +308,10 @@ fi %changelog +* Fri Jun 22 2018 Remi Collet - 1.9.3-4 +- add patch for PHP 7.3 from + https://github.com/pdezwart/php-amqp/pull/323 + * Mon May 14 2018 Remi Collet - 1.9.3-2 - rebuild for librabbitmq 0.8 in RHEL 7.5 -- cgit