diff options
author | Remi Collet <remi@remirepo.net> | 2024-07-01 08:37:10 +0200 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2024-07-01 08:37:10 +0200 |
commit | 59cc19e304d83e420b5a551b995c3fe588c16f2d (patch) | |
tree | 42dbc6b33505b69f8e8258c1e0eb07b24baa79e5 /php-pecl-yar.spec | |
parent | ae81b61a5c8628a09b237e32c762f552a527cec8 (diff) |
drop patch merged upstream
Diffstat (limited to 'php-pecl-yar.spec')
-rw-r--r-- | php-pecl-yar.spec | 37 |
1 files changed, 8 insertions, 29 deletions
diff --git a/php-pecl-yar.spec b/php-pecl-yar.spec index 07a8b8d..9e32e1f 100644 --- a/php-pecl-yar.spec +++ b/php-pecl-yar.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-yar # -# Copyright (c) 2013-2022 Remi Collet +# Copyright (c) 2013-2024 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -24,19 +24,17 @@ Summary: Light, concurrent RPC framework Name: %{?scl_prefix}php-pecl-%{pecl_name} -Version: 2.3.2 +Version: 2.3.3 %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 %else -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz %endif -License: PHP +License: PHP-3.01 URL: https://pecl.php.net/package/%{pecl_name} -Patch0: %{pecl_name}-php82.patch - BuildRequires: %{?dtsprefix}gcc BuildRequires: make BuildRequires: curl-devel @@ -50,7 +48,6 @@ Requires: %{?scl_prefix}php(api) = %{php_core_api} Requires: %{?scl_prefix}php-curl%{?_isa} Requires: %{?scl_prefix}php-json%{?_isa} Requires: %{?scl_prefix}php-pecl(msgpack)%{?_isa} -%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} Provides: %{?scl_prefix}php-%{pecl_name} = %{version} Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} @@ -80,8 +77,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -%patch0 -p1 -b .pr177 - # 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 @@ -162,26 +157,6 @@ do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done -%if 0%{?fedora} < 24 && 0%{?rhel} < 8 -# when pear installed alone, after us -%triggerin -- %{?scl_prefix}php-pear -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -# posttrans as pear can be installed after us -%posttrans -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -%postun -if [ $1 -eq 0 -a -x %{__pecl} ] ; then - %{pecl_uninstall} %{pecl_name} >/dev/null || : -fi -%endif - - %check DEPS="-n" if [ -f %{php_extdir}/json.so ]; then @@ -239,6 +214,10 @@ export YAR_API_PORT=$(%{__php} -r 'echo 8960 + PHP_MAJOR_VERSION*100 + PHP_MINOR %changelog +* Mon Jul 1 2024 Remi Collet <remi@remirepo.net> - 2.3.3-1 +- update to 2.3.3 +- drop patch merged upstream + * Mon Oct 3 2022 Remi Collet <remi@remirepo.net> - 2.3.2-2 - add patch for PHP 8.2 from https://github.com/laruence/yar/pull/177 |