diff options
Diffstat (limited to 'php-pecl-zmq.spec')
| -rw-r--r-- | php-pecl-zmq.spec | 49 |
1 files changed, 19 insertions, 30 deletions
diff --git a/php-pecl-zmq.spec b/php-pecl-zmq.spec index b06f407..b109434 100644 --- a/php-pecl-zmq.spec +++ b/php-pecl-zmq.spec @@ -3,9 +3,9 @@ # # Fedora spec file for php-pecl-zmq # -# Copyright (c) 2013-2023 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2013-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # @@ -26,7 +26,7 @@ Summary: ZeroMQ messaging Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 1.1.3 -Release: 18%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 19%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: BSD-3-Clause URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz @@ -34,6 +34,7 @@ Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz Patch0: https://patch-diff.githubusercontent.com/raw/zeromq/php-zmq/pull/216.patch Patch1: https://patch-diff.githubusercontent.com/raw/zeromq/php-zmq/pull/222.patch Patch2: https://patch-diff.githubusercontent.com/raw/zeromq/php-zmq/pull/228.patch +Patch3: https://patch-diff.githubusercontent.com/raw/zeromq/php-zmq/pull/238.patch BuildRequires: make BuildRequires: %{?dtsprefix}gcc @@ -74,6 +75,7 @@ cd %{sources} %patch -P0 -p1 -b .pr216 %patch -P1 -p1 -b .pr222 %patch -P2 -p1 -b .pr228 +%patch -P3 -p1 -b .pr238 if pkg-config libzmq --atleast-version=4 then @@ -108,13 +110,16 @@ EOF cd %{sources} %{__phpize} +[ -f Makefile.global ] && GLOBAL=Makefile.global || GLOBAL=build/Makefile.global +sed -e 's/INSTALL_ROOT/DESTDIR/' -i $GLOBAL cd ../NTS %configure \ --with-zmq \ --with-libdir=%{_lib} \ --with-php-config=%{__phpconfig} -make %{?_smp_mflags} + +%make_build %if %{with_zts} cd ../ZTS @@ -122,15 +127,15 @@ cd ../ZTS --with-zmq \ --with-libdir=%{_lib} \ --with-php-config=%{__ztsphpconfig} -make %{?_smp_mflags} + +%make_build %endif %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} @@ -139,8 +144,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 @@ -151,26 +155,6 @@ do install -Dpm 644 %{sources}/$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 cd %{sources} @@ -217,6 +201,11 @@ export TEST_PHP_EXECUTABLE=%{__ztsphp} %changelog +* Wed Jan 22 2025 Remi Collet <remi@remirepo.net> - 1.1.3-19 +- fix build with GCC 15 using patch from + https://github.com/zeromq/php-zmq/pull/238 +- re-license spec file to CECILL-2.1 + * Wed Aug 30 2023 Remi Collet <remi@remirepo.net> - 1.1.3-18 - rebuild for PHP 8.3.0RC1 |