diff options
Diffstat (limited to 'php-pecl-swoole5.spec')
| -rw-r--r-- | php-pecl-swoole5.spec | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/php-pecl-swoole5.spec b/php-pecl-swoole5.spec index 1f1ff6c..03e2bd5 100644 --- a/php-pecl-swoole5.spec +++ b/php-pecl-swoole5.spec @@ -39,7 +39,7 @@ %bcond_without curl %bcond_without nghttpd2 -%global upstream_version 5.1.4 +%global upstream_version 5.1.5 #global upstream_prever RC2 %global sources %{pecl_name}-%{upstream_version}%{?upstream_prever} %global _configure ../%{sources}/configure @@ -58,7 +58,8 @@ Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upst BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?dtsprefix}gcc-c++ -BuildRequires: %{?scl_prefix}php-devel >= 8.0 +# See https://github.com/swoole/swoole-src/issues/5534 +BuildRequires: (%{?scl_prefix}php-devel >= 8.0 with %{?scl_prefix}php-devel < 8.4) BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-curl BuildRequires: %{?scl_prefix}php-json @@ -168,8 +169,8 @@ sed \ -e '/Makefile/s/role="doc"/role="src"/' \ -e '/samples/s/role="doc"/role="src"/' \ -e '/name="library/s/role="doc"/role="src"/' \ - %{?_licensedir: -e '/LICENSE/s/role="doc"/role="src"/' } \ - %{?_licensedir: -e '/COPYING/s/role="doc"/role="src"/' } \ + -e '/LICENSE/s/role="doc"/role="src"/' \ + -e '/COPYING/s/role="doc"/role="src"/' \ -i package.xml @@ -247,11 +248,12 @@ peclbuild() { --with-libdir=%{_lib} \ --with-php-config=$1 -make %{?_smp_mflags} +%make_build } cd %{sources} %{__phpize} +sed -e 's/INSTALL_ROOT/DESTDIR/' -i build/Makefile.global cd ../NTS peclbuild %{__phpconfig} @@ -265,8 +267,7 @@ peclbuild %{__ztsphpconfig} %install %{?dtsenable} -make -C NTS \ - install INSTALL_ROOT=%{buildroot} +%make_install -C NTS # install config file install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} @@ -275,8 +276,7 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml %if %{with_zts} -make -C ZTS \ - install INSTALL_ROOT=%{buildroot} +%make_install -C ZTS install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} %endif @@ -317,10 +317,8 @@ cd ../ZTS %files -%{?_licensedir:%license %{sources}/LICENSE} -%{?_licensedir:%license %{sources}/*-COPYING} -%{!?_licensedir:%{pecl_docdir}/%{pecl_name}/LICENSE} -%{!?_licensedir:%{pecl_docdir}/%{pecl_name}/thirdparty/*/COPYING} +%license %{sources}/LICENSE +%license %{sources}/*-COPYING %doc %{pecl_docdir}/%{pecl_name}/*md %{pecl_xmldir}/%{name}.xml @@ -348,6 +346,9 @@ cd ../ZTS %changelog +* Tue Oct 22 2024 Remi Collet <remi@remirepo.net> - 5.1.5-1 +- update to 5.1.5 + * Mon Aug 26 2024 Remi Collet <remi@remirepo.net> - 5.1.4-1 - update to 5.1.4 - drop patch merged upstream |