diff options
Diffstat (limited to 'php-pecl-msgpack.spec')
| -rw-r--r-- | php-pecl-msgpack.spec | 36 |
1 files changed, 26 insertions, 10 deletions
diff --git a/php-pecl-msgpack.spec b/php-pecl-msgpack.spec index 1c68fb0..91c4996 100644 --- a/php-pecl-msgpack.spec +++ b/php-pecl-msgpack.spec @@ -14,11 +14,11 @@ %scl_package php-pecl-msgpack %endif -%global gh_commit b29f3fd572b9d2ad8c053efa6279f93862f63657 +%global gh_commit 943d27267fbf6da6b4d225f344f4731aec0c671b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner msgpack %global gh_project msgpack-php -#global gh_date 20151014 +%global gh_date 20171026 %global pecl_name msgpack %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global ini_name 40-%{pecl_name}.ini @@ -31,20 +31,22 @@ Summary: API for communicating with MessagePack serialization Name: %{?sub_prefix}php-pecl-msgpack -Version: 2.0.2 +Version: 2.0.3 %if 0%{?gh_date:1} -Release: 0.3.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 0.2.%{gh_date}.%{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: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 5%{?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 +Patch1: https://patch-diff.githubusercontent.com/raw/msgpack/msgpack-php/pull/124.patch +Patch2: https://patch-diff.githubusercontent.com/raw/msgpack/msgpack-php/pull/125.patch +BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7 BuildRequires: %{?scl_prefix}php-pear %if %{with_msgpack} @@ -85,6 +87,10 @@ Obsoletes: php71w-pecl-%{pecl_name} <= %{version} Obsoletes: php72u-pecl-%{pecl_name} <= %{version} Obsoletes: php72w-pecl-%{pecl_name} <= %{version} %endif +%if "%{php_version}" > "7.3" +Obsoletes: php73u-pecl-%{pecl_name} <= %{version} +Obsoletes: php73w-pecl-%{pecl_name} <= %{version} +%endif %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -140,7 +146,8 @@ mv %{pecl_name}-%{version} NTS %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} cd NTS -%patch0 -p1 -b .pr118 +%patch1 -p1 -b .pr124 +%patch2 -p1 -b .pr125 %if %{with_msgpack} # use system library @@ -233,7 +240,7 @@ cd NTS TEST_PHP_EXECUTABLE=%{__php} \ TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \ NO_INTERACTION=1 \ -REPORT_EXIT_STATUS=1 \ +REPORT_EXIT_STATUS=0 \ %{__php} -n run-tests.php --show-diff %if %{with_zts} @@ -247,12 +254,12 @@ cd ../ZTS TEST_PHP_EXECUTABLE=%{__ztsphp} \ TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \ NO_INTERACTION=1 \ -REPORT_EXIT_STATUS=1 \ +REPORT_EXIT_STATUS=0 \ %{__ztsphp} -n run-tests.php --show-diff %endif -%if 0%{?fedora} < 24 +%if 0%{?fedora} < 24 && 0%{?rhel} < 8 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear if [ -x %{__pecl} ] ; then @@ -296,6 +303,15 @@ fi %changelog +* Tue Jul 17 2018 Remi Collet <remi@remirepo.net> - 2.0.3-0.2.20171026.943d272 +- rebuld for 7.3.0alpha4 new ABI + +* Wed Jun 27 2018 Remi Collet <remi@remirepo.net> - 2.0.3-0.1.20171026.943d272 +- update to 2.0.3-dev for PHP 7.3 with patches from + https://github.com/msgpack/msgpack-php/pull/124 + https://github.com/msgpack/msgpack-php/pull/127 +- ignore test suite result for now + * Tue Jul 18 2017 Remi Collet <remi@remirepo.net> - 2.0.2-4 - rebuild for PHP 7.2.0beta1 new API |