From c70d486fb109e0692760c779d8799c754ee47618 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 10 Jun 2016 08:29:50 +0200 Subject: php-pecl-stomp: add upstream ppatch for PHP 7.1 --- php-pecl-stomp-php7.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'php-pecl-stomp-php7.spec') diff --git a/php-pecl-stomp-php7.spec b/php-pecl-stomp-php7.spec index 00c0668..7072fab 100644 --- a/php-pecl-stomp-php7.spec +++ b/php-pecl-stomp-php7.spec @@ -16,12 +16,14 @@ Summary: Stomp client extension Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 2.0.0 -Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz +Patch0: %{pecl_name}-upstream.patch + BuildRequires: %{?scl_prefix}php-devel > 7 BuildRequires: %{?scl_prefix}php-pear BuildRequires: openssl-devel @@ -51,6 +53,10 @@ Obsoletes: php56u-pecl-%{pecl_name} <= %{version} Obsoletes: php56w-pecl-%{pecl_name} <= %{version} Obsoletes: php70u-pecl-%{pecl_name} <= %{version} Obsoletes: php70w-pecl-%{pecl_name} <= %{version} +%if "%{php_version}" > "7.1" +Obsoletes: php71u-pecl-%{pecl_name} <= %{version} +Obsoletes: php71w-pecl-%{pecl_name} <= %{version} +%endif %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -80,6 +86,7 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS +%patch0 -p1 -b .upstream # Sanity check, really often broken extver=$(sed -n '/#define PHP_STOMP_VERSION/{s/.* "//;s/".*$//;p}' php_stomp.h) @@ -205,6 +212,9 @@ fi %changelog +* Fri Jun 10 2016 Remi Collet - 2.0.0-2 +- add upstream patch for PHP 7.1 + * Thu May 26 2016 Remi Collet - 2.0.0-1 - update to 2.0.0 (php 7, beta) -- cgit