diff options
| author | Remi Collet <remi@remirepo.net> | 2024-08-26 09:12:03 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2024-08-26 09:12:03 +0200 |
| commit | ce626619c29516712e060531ae1be20ae0372276 (patch) | |
| tree | a2490d8b3022a5bfe4b8556354222729e2cbbec9 /php-pecl-swoole5.spec | |
| parent | 3e818862cb1120788bc66fa85ba00a3588878a23 (diff) | |
drop patch merged upstream
Diffstat (limited to 'php-pecl-swoole5.spec')
| -rw-r--r-- | php-pecl-swoole5.spec | 47 |
1 files changed, 5 insertions, 42 deletions
diff --git a/php-pecl-swoole5.spec b/php-pecl-swoole5.spec index 69e0d30..1f1ff6c 100644 --- a/php-pecl-swoole5.spec +++ b/php-pecl-swoole5.spec @@ -34,27 +34,12 @@ %endif -%if 0%{?fedora} || 0%{?rhel} >= 8 %bcond_without pgsql -%else -%bcond_with pgsql -%endif - -%if 0%{?fedora} || 0%{?rhel} >= 8 %bcond_without brotli -%else -%bcond_with brotli -%endif - -%if 0%{?fedora} || 0%{?rhel} >= 8 %bcond_without curl -%else -%bcond_with curl -%endif - %bcond_without nghttpd2 -%global upstream_version 5.1.3 +%global upstream_version 5.1.4 #global upstream_prever RC2 %global sources %{pecl_name}-%{upstream_version}%{?upstream_prever} %global _configure ../%{sources}/configure @@ -70,9 +55,6 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz -Patch0: 0001-missing-header.patch -Patch1: 0002-fix-implicit-int.patch - BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?dtsprefix}gcc-c++ @@ -192,9 +174,6 @@ sed \ cd %{sources} -%patch -P0 -p1 -%patch -P1 -p1 - cp -p thirdparty/hiredis/COPYING hiredis-COPYING %if %{with nghttpd2} rm -r thirdparty/nghttp2 @@ -315,26 +294,6 @@ rm %{buildroot}%{pecl_testdir}/%{pecl_name}/tests/swoole_process/echo.py rm %{buildroot}%{pecl_docdir}/%{pecl_name}/examples/process/echo.py -%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 OPT="--no-php-ini" [ -f %{php_extdir}/curl.so ] && OPT="$OPT -d extension=curl" @@ -389,6 +348,10 @@ cd ../ZTS %changelog +* Mon Aug 26 2024 Remi Collet <remi@remirepo.net> - 5.1.4-1 +- update to 5.1.4 +- drop patch merged upstream + * Thu Jun 6 2024 Remi Collet <remi@remirepo.net> - 5.1.3-1 - update to 5.1.3 - fix build warnings (errors with GCC 14) using patch from |