diff options
| author | Remi Collet <remi@remirepo.net> | 2025-05-31 08:18:17 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-05-31 08:18:17 +0200 |
| commit | d0bd7ac85194fdc5aa2d55690a951293fd91b29c (patch) | |
| tree | b856ee25c6db3a6e927bc647c1cc885f85d7a681 /php-pecl-nsq.spec | |
| parent | c2524378451b7fdfb6e39e47577f602f4b4a88aa (diff) | |
drop patch merged upstream
Diffstat (limited to 'php-pecl-nsq.spec')
| -rw-r--r-- | php-pecl-nsq.spec | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/php-pecl-nsq.spec b/php-pecl-nsq.spec index 044cade..7d21000 100644 --- a/php-pecl-nsq.spec +++ b/php-pecl-nsq.spec @@ -21,14 +21,12 @@ Summary: PHP extension for NSQ client Name: %{?scl_prefix}php-pecl-nsq -Version: 3.5.1 -Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 3.9.0 +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source: https://pecl.php.net/get/%{sources}%{?prever}.tgz License: PHP-3.01 URL: https://pecl.php.net/package/nsq -Patch0: 0001-fix-prototype.patch - BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7.0 @@ -61,8 +59,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd %{sources} -%patch -P0 -p1 -b .proto - # Sanity check, really often broken extver=$(sed -n '/#define PHP_NSQ_VERSION/{s/.* "//;s/".*$//;p}' php_nsq.h ) if test "x${extver}" != "x%{version}"; then @@ -90,13 +86,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-nsq \ --with-libevent-path=%{_root_prefix} \ --with-php-config=%{__phpconfig} -make %{?_smp_mflags} + +%make_build %if %{with_zts} cd ../ZTS @@ -104,7 +103,8 @@ cd ../ZTS --with-nsq \ --with-libevent-path=%{_root_prefix} \ --with-php-config=%{__ztsphpconfig} -make %{?_smp_mflags} + +%make_build %endif @@ -112,12 +112,12 @@ make %{?_smp_mflags} %{?dtsenable} : Install the NTS stuff -make -C NTS install INSTALL_ROOT=%{buildroot} +%make_install -C NTS install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} : Install the ZTS stuff %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 @@ -175,6 +175,10 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Sat May 31 2025 Remi Collet <remi@remirepo.net> - 3.9.0-1 +- update to 3.9.0 +- drop patch merged upstream + * Thu Feb 20 2025 Remi Collet <remi@remirepo.net> - 3.5.1-3 - fix lookup function prototype using patch from https://github.com/yunnian/php-nsq/pull/76 |