diff options
| author | Remi Collet <remi@remirepo.net> | 2020-03-16 10:28:18 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-03-16 10:28:18 +0100 |
| commit | 6638370fe5fb4a5e571a6c9468c0e393204ec5c1 (patch) | |
| tree | 52a518869caa6b4d983689c0b589f1bcd077578f /php-pecl-yar.spec | |
| parent | 422b2ff6f1437043483cf3f304ddf47e9f15a70e (diff) | |
update to 2.1.1
drop patches merged upstream
Diffstat (limited to 'php-pecl-yar.spec')
| -rw-r--r-- | php-pecl-yar.spec | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/php-pecl-yar.spec b/php-pecl-yar.spec index 22ac9f5..d661529 100644 --- a/php-pecl-yar.spec +++ b/php-pecl-yar.spec @@ -29,7 +29,7 @@ Summary: Light, concurrent RPC framework Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 2.1.0 +Version: 2.1.1 %if 0%{?gh_date:1} Release: 0.14.%{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 @@ -40,9 +40,6 @@ Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz License: PHP URL: https://pecl.php.net/package/%{pecl_name} -Source1: https://raw.githubusercontent.com/laruence/yar/yar-2.1.0/tests/htdocs/internal.php -Patch0: https://patch-diff.githubusercontent.com/raw/laruence/yar/pull/151.patch - BuildRequires: %{?dtsprefix}gcc BuildRequires: curl-devel BuildRequires: %{?scl_prefix}php-devel > 7 @@ -52,14 +49,8 @@ BuildRequires: %{?sub_prefix}php-pecl-msgpack-devel Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} -%if "%{php_version}" < "5.4" -# php 5.3.3 in EL-6 don't use arched virtual provides -# so only requires real packages instead -Requires: %{?scl_prefix}php-common%{?_isa} -%else Requires: %{?scl_prefix}php-curl%{?_isa} Requires: %{?scl_prefix}php-json%{?_isa} -%endif Requires: %{?scl_prefix}php-pecl(msgpack)%{?_isa} %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} @@ -117,9 +108,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -cp %{SOURCE1} tests/htdocs/internal.php -%patch0 -p1 - # Sanity check, really often broken extver=$(sed -n '/#define PHP_YAR_VERSION/{s/.* "//;s/".*$//;p}' php_yar.h) if test "x${extver}" != "x%{version}%{?prever:-%{prever}}%{?gh_date:-dev}"; then @@ -275,6 +263,10 @@ export YAR_API_PORT=$(%{__php} -r 'echo 8960 + PHP_MAJOR_VERSION*100 + PHP_MINOR %changelog +* Mon Mar 16 2020 Remi Collet <remi@remirepo.net> - 2.1.1-1 +- update to 2.1.1 +- drop patches merged upstream + * Mon Mar 16 2020 Remi Collet <remi@remirepo.net> - 2.1.0-1 - update to 2.1.0 - fix build with msgpack using patch from |