From 56ebaa85fc339d78cef2012c20977a996fdffe14 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 14 Apr 2017 09:35:24 +0200 Subject: add patch for 7.2 --- php-pecl-msgpack.spec | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'php-pecl-msgpack.spec') diff --git a/php-pecl-msgpack.spec b/php-pecl-msgpack.spec index 5d4bcd1..7f51a0e 100644 --- a/php-pecl-msgpack.spec +++ b/php-pecl-msgpack.spec @@ -36,13 +36,15 @@ Version: 2.0.2 Release: 0.2.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz %else -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;')}} Source: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz %endif License: BSD Group: Development/Languages URL: http://pecl.php.net/package/msgpack +Patch0: %{pecl_name}-pr118.patch + BuildRequires: %{?scl_prefix}php-devel >= 7 BuildRequires: %{?scl_prefix}php-pear %if %{with_msgpack} @@ -79,6 +81,10 @@ Obsoletes: php70w-pecl-%{pecl_name} <= %{version} 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 %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -134,14 +140,13 @@ mv %{pecl_name}-%{version} NTS %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} cd NTS +%patch0 -p1 -b .pr118 + %if %{with_msgpack} # use system library rm -rf msgpack %endif -# When this file will be removed, clean the description. -[ -f EXPERIMENTAL ] || exit 1 - # Sanity check, really often broken extver=$(sed -n '/#define PHP_MSGPACK_VERSION/{s/.* "//;s/".*$//;p}' php_msgpack.h) if test "x${extver}" != "x%{version}%{?gh_date:-dev}"; then @@ -169,6 +174,8 @@ EOF %build +%{?dtsenable} + cd NTS %{_bindir}/phpize %configure --with-php-config=%{_bindir}/php-config @@ -183,6 +190,8 @@ make %{?_smp_mflags} %install +%{?dtsenable} + # Install the NTS stuff make -C NTS install INSTALL_ROOT=%{buildroot} install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} @@ -287,6 +296,10 @@ fi %changelog +* Fri Apr 14 2017 Remi Collet - 2.0.2-2 +- add patch for test suite with PHP 7.2 from + https://github.com/msgpack/msgpack-php/pull/118 + * Wed Dec 7 2016 Remi Collet - 2.0.2-1 - update to 2.0.2 -- cgit