summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--PHPINFO4
-rw-r--r--REFLECTION154
-rw-r--r--gearman-php81.patch36
-rw-r--r--php-pecl-gearman.spec61
4 files changed, 107 insertions, 148 deletions
diff --git a/PHPINFO b/PHPINFO
index d6b0184..aca0896 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,7 +2,7 @@
gearman
gearman support => enabled
-extension version => 2.1.0
-libgearman version => 1.1.19.1
+extension version => 2.1.4
+libgearman version => 1.1.21
Default TCP Host => localhost
Default TCP Port => 4730
diff --git a/REFLECTION b/REFLECTION
index c5c6f15..690f432 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
+Extension [ <persistent> extension #78 gearman version 2.1.4 ] {
- Constants [157] {
Constant [ string GEARMAN_DEFAULT_TCP_HOST ] { localhost }
@@ -197,28 +197,28 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
- Parameters [1] {
Parameter #0 [ <required> GearmanClient $obj ]
}
- - Return [ ?int ]
+ - Return [ int ]
}
Function [ <internal:gearman> function gearman_client_error ] {
- Parameters [1] {
Parameter #0 [ <required> GearmanClient $obj ]
}
- - Return [ string|false|null ]
+ - Return [ string|false ]
}
Function [ <internal:gearman> function gearman_client_get_errno ] {
- Parameters [1] {
Parameter #0 [ <required> GearmanClient $obj ]
}
- - Return [ ?int ]
+ - Return [ int ]
}
Function [ <internal:gearman> function gearman_client_options ] {
- Parameters [1] {
Parameter #0 [ <required> GearmanClient $obj ]
}
- - Return [ ?int ]
+ - Return [ int ]
}
Function [ <internal:gearman> function gearman_client_set_options ] {
@@ -263,7 +263,7 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
- Parameters [4] {
Parameter #0 [ <required> GearmanClient $obj ]
- Parameter #1 [ <optional> string $host = null ]
+ Parameter #1 [ <optional> ?string $host = null ]
Parameter #2 [ <optional> int $port = 0 ]
Parameter #3 [ <optional> bool $setupExceptionHandler = true ]
}
@@ -273,7 +273,7 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
- Parameters [3] {
Parameter #0 [ <required> GearmanClient $obj ]
- Parameter #1 [ <optional> string $servers = null ]
+ Parameter #1 [ <optional> ?string $servers = null ]
Parameter #2 [ <optional> bool $setupExceptionHandler = true ]
}
- Return [ bool ]
@@ -463,7 +463,7 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
Parameter #1 [ <required> string $job_handle ]
Parameter #2 [ <optional> mixed $context = null ]
}
- - Return [ GearmanTask ]
+ - Return [ GearmanTask|false ]
}
Function [ <internal:gearman> function gearman_client_set_workload_callback ] {
@@ -563,7 +563,7 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
- Parameters [1] {
Parameter #0 [ <required> GearmanJob $obj ]
}
- - Return [ ?int ]
+ - Return [ int ]
}
Function [ <internal:gearman> function gearman_job_set_return ] {
@@ -571,7 +571,7 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
Parameter #0 [ <required> GearmanJob $obj ]
Parameter #1 [ <required> int $gearman_return_t ]
}
- - Return [ ?bool ]
+ - Return [ bool ]
}
Function [ <internal:gearman> function gearman_job_send_data ] {
@@ -579,7 +579,7 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
Parameter #0 [ <required> GearmanJob $obj ]
Parameter #1 [ <required> string $data ]
}
- - Return [ ?bool ]
+ - Return [ bool ]
}
Function [ <internal:gearman> function gearman_job_send_warning ] {
@@ -626,21 +626,21 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
- Parameters [1] {
Parameter #0 [ <required> GearmanJob $obj ]
}
- - Return [ string|bool ]
+ - Return [ string|false ]
}
Function [ <internal:gearman> function gearman_job_function_name ] {
- Parameters [1] {
Parameter #0 [ <required> GearmanJob $obj ]
}
- - Return [ string|bool ]
+ - Return [ string|false ]
}
Function [ <internal:gearman> function gearman_job_unique ] {
- Parameters [1] {
Parameter #0 [ <required> GearmanJob $obj ]
}
- - Return [ string|bool ]
+ - Return [ string|false ]
}
Function [ <internal:gearman> function gearman_job_workload ] {
@@ -654,70 +654,70 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
- Parameters [1] {
Parameter #0 [ <required> GearmanJob $obj ]
}
- - Return [ ?int ]
+ - Return [ int ]
}
Function [ <internal:gearman> function gearman_task_return_code ] {
- Parameters [1] {
Parameter #0 [ <required> GearmanTask $obj ]
}
- - Return [ ?int ]
+ - Return [ int ]
}
Function [ <internal:gearman> function gearman_task_function_name ] {
- Parameters [1] {
Parameter #0 [ <required> GearmanTask $obj ]
}
- - Return [ string|bool|null ]
+ - Return [ string|false ]
}
Function [ <internal:gearman> function gearman_task_unique ] {
- Parameters [1] {
Parameter #0 [ <required> GearmanTask $obj ]
}
- - Return [ string|bool|null ]
+ - Return [ string|false ]
}
Function [ <internal:gearman> function gearman_task_job_handle ] {
- Parameters [1] {
Parameter #0 [ <required> GearmanTask $obj ]
}
- - Return [ string|bool|null ]
+ - Return [ string|false ]
}
Function [ <internal:gearman> function gearman_task_is_known ] {
- Parameters [1] {
Parameter #0 [ <required> GearmanTask $obj ]
}
- - Return [ ?bool ]
+ - Return [ bool ]
}
Function [ <internal:gearman> function gearman_task_is_running ] {
- Parameters [1] {
Parameter #0 [ <required> GearmanTask $obj ]
}
- - Return [ ?bool ]
+ - Return [ bool ]
}
Function [ <internal:gearman> function gearman_task_numerator ] {
- Parameters [1] {
Parameter #0 [ <required> GearmanTask $obj ]
}
- - Return [ int|bool|null ]
+ - Return [ int|false ]
}
Function [ <internal:gearman> function gearman_task_denominator ] {
- Parameters [1] {
Parameter #0 [ <required> GearmanTask $obj ]
}
- - Return [ int|bool|null ]
+ - Return [ int|false ]
}
Function [ <internal:gearman> function gearman_task_data ] {
- Parameters [1] {
Parameter #0 [ <required> GearmanTask $obj ]
}
- - Return [ string|bool|null ]
+ - Return [ string|false ]
}
Function [ <internal:gearman> function gearman_task_data_size ] {
@@ -740,14 +740,14 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
Parameter #0 [ <required> GearmanTask $obj ]
Parameter #1 [ <required> int $data_len ]
}
- - Return [ array|bool ]
+ - Return [ array|false ]
}
Function [ <internal:gearman> function gearman_worker_return_code ] {
- Parameters [1] {
Parameter #0 [ <required> GearmanWorker $obj ]
}
- - Return [ ?int ]
+ - Return [ int ]
}
Function [ <internal:gearman> function gearman_worker_error ] {
@@ -761,14 +761,14 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
- Parameters [1] {
Parameter #0 [ <required> GearmanWorker $obj ]
}
- - Return [ int|false ]
+ - Return [ int ]
}
Function [ <internal:gearman> function gearman_worker_options ] {
- Parameters [1] {
Parameter #0 [ <required> GearmanWorker $obj ]
}
- - Return [ ?int ]
+ - Return [ int ]
}
Function [ <internal:gearman> function gearman_worker_set_options ] {
@@ -776,7 +776,7 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
Parameter #0 [ <required> GearmanWorker $obj ]
Parameter #1 [ <required> int $option ]
}
- - Return [ ?bool ]
+ - Return [ true ]
}
Function [ <internal:gearman> function gearman_worker_add_options ] {
@@ -784,7 +784,7 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
Parameter #0 [ <required> GearmanWorker $obj ]
Parameter #1 [ <required> int $option ]
}
- - Return [ ?bool ]
+ - Return [ true ]
}
Function [ <internal:gearman> function gearman_worker_remove_options ] {
@@ -792,14 +792,14 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
Parameter #0 [ <required> GearmanWorker $obj ]
Parameter #1 [ <required> int $option ]
}
- - Return [ ?bool ]
+ - Return [ true ]
}
Function [ <internal:gearman> function gearman_worker_timeout ] {
- Parameters [1] {
Parameter #0 [ <required> GearmanWorker $obj ]
}
- - Return [ ?int ]
+ - Return [ int ]
}
Function [ <internal:gearman> function gearman_worker_set_timeout ] {
@@ -807,7 +807,7 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
Parameter #0 [ <required> GearmanWorker $obj ]
Parameter #1 [ <required> int $timeout ]
}
- - Return [ bool ]
+ - Return [ true ]
}
Function [ <internal:gearman> function gearman_worker_set_id ] {
@@ -819,18 +819,20 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
}
Function [ <internal:gearman> function gearman_worker_add_server ] {
- - Parameters [3] {
+ - Parameters [4] {
Parameter #0 [ <required> GearmanWorker $obj ]
- Parameter #1 [ <optional> string $host = null ]
+ Parameter #1 [ <optional> ?string $host = null ]
Parameter #2 [ <optional> int $port = 0 ]
+ Parameter #3 [ <optional> bool $setupExceptionHandler = true ]
}
- Return [ bool ]
}
Function [ <internal:gearman> function gearman_worker_add_servers ] {
- - Parameters [2] {
+ - Parameters [3] {
Parameter #0 [ <required> GearmanWorker $obj ]
- Parameter #1 [ <optional> string $servers = null ]
+ Parameter #1 [ <optional> ?string $servers = null ]
+ Parameter #2 [ <optional> bool $setupExceptionHandler = true ]
}
- Return [ bool ]
}
@@ -898,6 +900,13 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
}
- Return [ bool ]
}
+ Function [ <internal:gearman> function gearman_worker_enable_exception_handler ] {
+
+ - Parameters [1] {
+ Parameter #0 [ <required> GearmanWorker $obj ]
+ }
+ - Return [ bool ]
+ }
}
- Classes [5] {
@@ -998,7 +1007,7 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
Method [ <internal:gearman> public method addServer ] {
- Parameters [3] {
- Parameter #0 [ <optional> string $host = null ]
+ Parameter #0 [ <optional> ?string $host = null ]
Parameter #1 [ <optional> int $port = 0 ]
Parameter #2 [ <optional> bool $setupExceptionHandler = true ]
}
@@ -1008,7 +1017,7 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
Method [ <internal:gearman> public method addServers ] {
- Parameters [2] {
- Parameter #0 [ <optional> string $servers = null ]
+ Parameter #0 [ <optional> ?string $servers = null ]
Parameter #1 [ <optional> bool $setupExceptionHandler = true ]
}
- Return [ bool ]
@@ -1041,7 +1050,7 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
- Return [ string ]
}
- Method [ <internal:gearman> public method dolow ] {
+ Method [ <internal:gearman> public method doLow ] {
- Parameters [3] {
Parameter #0 [ <required> string $function ]
@@ -1198,7 +1207,7 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
Parameter #0 [ <required> string $job_handle ]
Parameter #1 [ <optional> mixed $context = null ]
}
- - Return [ GearmanTask ]
+ - Return [ GearmanTask|false ]
}
Method [ <internal:gearman> public method setWorkloadCallback ] {
@@ -1328,21 +1337,21 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
- Parameters [0] {
}
- - Return [ string|bool ]
+ - Return [ string|false ]
}
Method [ <internal:gearman> public method unique ] {
- Parameters [0] {
}
- - Return [ string|bool ]
+ - Return [ string|false ]
}
Method [ <internal:gearman> public method jobHandle ] {
- Parameters [0] {
}
- - Return [ string|bool ]
+ - Return [ string|false ]
}
Method [ <internal:gearman> public method isKnown ] {
@@ -1363,21 +1372,21 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
- Parameters [0] {
}
- - Return [ int|bool ]
+ - Return [ int|false ]
}
Method [ <internal:gearman> public method taskDenominator ] {
- Parameters [0] {
}
- - Return [ int|bool ]
+ - Return [ int|false ]
}
Method [ <internal:gearman> public method data ] {
- Parameters [0] {
}
- - Return [ string|bool ]
+ - Return [ string|false ]
}
Method [ <internal:gearman> public method dataSize ] {
@@ -1400,7 +1409,7 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
- Parameters [1] {
Parameter #0 [ <required> int $data_len ]
}
- - Return [ array|bool ]
+ - Return [ array|false ]
}
}
}
@@ -1419,7 +1428,7 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
- Properties [0] {
}
- - Methods [22] {
+ - Methods [23] {
Method [ <internal:gearman, ctor> public method __construct ] {
- Parameters [0] {
@@ -1436,7 +1445,7 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
- Parameters [0] {
}
- - Return [ ?int ]
+ - Return [ int ]
}
Method [ <internal:gearman> public method error ] {
@@ -1450,14 +1459,14 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
- Parameters [0] {
}
- - Return [ int|false ]
+ - Return [ int ]
}
Method [ <internal:gearman> public method options ] {
- Parameters [0] {
}
- - Return [ ?int ]
+ - Return [ int ]
}
Method [ <internal:gearman> public method setOptions ] {
@@ -1465,7 +1474,7 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
- Parameters [1] {
Parameter #0 [ <required> int $option ]
}
- - Return [ ?bool ]
+ - Return [ true ]
}
Method [ <internal:gearman> public method addOptions ] {
@@ -1473,7 +1482,7 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
- Parameters [1] {
Parameter #0 [ <required> int $option ]
}
- - Return [ ?bool ]
+ - Return [ true ]
}
Method [ <internal:gearman> public method removeOptions ] {
@@ -1481,14 +1490,14 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
- Parameters [1] {
Parameter #0 [ <required> int $option ]
}
- - Return [ ?bool ]
+ - Return [ true ]
}
Method [ <internal:gearman> public method timeout ] {
- Parameters [0] {
}
- - Return [ ?int ]
+ - Return [ int ]
}
Method [ <internal:gearman> public method setTimeout ] {
@@ -1496,7 +1505,7 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
- Parameters [1] {
Parameter #0 [ <required> int $timeout ]
}
- - Return [ bool ]
+ - Return [ true ]
}
Method [ <internal:gearman> public method setId ] {
@@ -1509,17 +1518,19 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
Method [ <internal:gearman> public method addServer ] {
- - Parameters [2] {
- Parameter #0 [ <optional> string $host = null ]
+ - Parameters [3] {
+ Parameter #0 [ <optional> ?string $host = null ]
Parameter #1 [ <optional> int $port = 0 ]
+ Parameter #2 [ <optional> bool $setupExceptionHandler = true ]
}
- Return [ bool ]
}
Method [ <internal:gearman> public method addServers ] {
- - Parameters [1] {
- Parameter #0 [ <optional> string $servers = null ]
+ - Parameters [2] {
+ Parameter #0 [ <optional> ?string $servers = null ]
+ Parameter #1 [ <optional> bool $setupExceptionHandler = true ]
}
- Return [ bool ]
}
@@ -1587,6 +1598,13 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
}
- Return [ bool ]
}
+
+ Method [ <internal:gearman> public method enableExceptionHandler ] {
+
+ - Parameters [0] {
+ }
+ - Return [ bool ]
+ }
}
}
@@ -1615,7 +1633,7 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
- Parameters [0] {
}
- - Return [ ?int ]
+ - Return [ int ]
}
Method [ <internal:gearman> public method setReturn ] {
@@ -1623,7 +1641,7 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
- Parameters [1] {
Parameter #0 [ <required> int $gearman_return_t ]
}
- - Return [ ?bool ]
+ - Return [ bool ]
}
Method [ <internal:gearman> public method sendData ] {
@@ -1631,7 +1649,7 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
- Parameters [1] {
Parameter #0 [ <required> string $data ]
}
- - Return [ ?bool ]
+ - Return [ bool ]
}
Method [ <internal:gearman> public method sendWarning ] {
@@ -1678,21 +1696,21 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
- Parameters [0] {
}
- - Return [ string|bool ]
+ - Return [ string|false ]
}
Method [ <internal:gearman> public method functionName ] {
- Parameters [0] {
}
- - Return [ string|bool ]
+ - Return [ string|false ]
}
Method [ <internal:gearman> public method unique ] {
- Parameters [0] {
}
- - Return [ string|bool ]
+ - Return [ string|false ]
}
Method [ <internal:gearman> public method workload ] {
@@ -1706,7 +1724,7 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
- Parameters [0] {
}
- - Return [ ?int ]
+ - Return [ int ]
}
}
}
diff --git a/gearman-php81.patch b/gearman-php81.patch
deleted file mode 100644
index 0452954..0000000
--- a/gearman-php81.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7da13e4babc17067b2b45d6b37041c3c8ed91637 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Fri, 11 Jun 2021 08:05:40 +0200
-Subject: [PATCH] remove ZVAL_NEW_ARR usage
-
----
- php_gearman_worker.c | 2 +-
- tests/skipifconnect.inc | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/php_gearman_worker.c b/php_gearman_worker.c
-index 21b64e4..7ab5f6e 100644
---- a/php_gearman_worker.c
-+++ b/php_gearman_worker.c
-@@ -91,7 +91,7 @@ zend_object *gearman_worker_obj_new(zend_class_entry *ce) {
- zend_object_std_init(&(intern->std), ce);
- object_properties_init(&intern->std, ce);
-
-- ZVAL_NEW_ARR(&intern->cb_list);
-+ array_init(&intern->cb_list);
- zend_hash_init(Z_ARRVAL(intern->cb_list), 0, NULL, cb_list_dtor, 0);
-
- intern->std.handlers = &gearman_worker_obj_handlers;
-diff --git a/tests/skipifconnect.inc b/tests/skipifconnect.inc
-index e4df5e3..ca0e1db 100644
---- a/tests/skipifconnect.inc
-+++ b/tests/skipifconnect.inc
-@@ -4,7 +4,7 @@ if (getenv("SKIP_ONLINE_TESTS")) die("skip online test");
-
- require_once('connect.inc');
-
--$sock = fsockopen($host, $port);
-+$sock = @fsockopen($host, $port);
- if ($sock === false) {
- die("skip unable to connect");
- }
diff --git a/php-pecl-gearman.spec b/php-pecl-gearman.spec
index 7c9b793..3612df5 100644
--- a/php-pecl-gearman.spec
+++ b/php-pecl-gearman.spec
@@ -18,25 +18,22 @@
%bcond_without tests
-%global extver 2.1.0
%global libver 1.1.0
Name: %{?scl_prefix}php-pecl-gearman
-Version: %{extver}
-Release: 7%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Version: 2.1.4
+Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
Summary: PHP wrapper to libgearman
License: PHP-3.01
URL: https://pecl.php.net/package/gearman
Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz
-Patch0: %{pecl_name}-php81.patch
-
BuildRequires: libgearman-devel > %{libver}
BuildRequires: make
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?dtsprefix}gcc
-BuildRequires: %{?scl_prefix}php-devel >= 7.0
+BuildRequires: %{?scl_prefix}php-devel >= 7.1
BuildRequires: %{?scl_prefix}php-pear
# Required by phpize
BuildRequires: autoconf, automake, libtool
@@ -49,13 +46,6 @@ Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}
Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
-%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} == 7
-# Other third party repo stuff
-Obsoletes: php55w-pecl-%{pecl_name} <= %{version}
-Obsoletes: php56u-pecl-%{pecl_name} <= %{version}
-Obsoletes: php56w-pecl-%{pecl_name} <= %{version}
-%endif
-
%description
This extension uses libgearman library to provide API for
@@ -76,8 +66,6 @@ sed -e 's/role="test"/role="src"/' \
pushd %{sources}
-%patch -P0 -p1
-
extver=$(sed -n '/#define PHP_GEARMAN_VERSION/{s/.* "//;s/".*$//;p}' php_gearman.h)
if test "x${extver}" != "x%{version}"; then
: Error: Upstream version is ${extver}, expecting %{version}.
@@ -90,8 +78,6 @@ cat >%{ini_name} <<EOF
extension=%{pecl_name}.so
EOF
-find %{sources} -type f -exec chmod -x {} \;
-
mkdir NTS
%if %{with_zts}
mkdir ZTS
@@ -103,22 +89,24 @@ mkdir ZTS
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-php-config=%{__phpconfig}
-make %{?_smp_mflags}
+%make_build
%if %{with_zts}
cd ../ZTS
%configure --with-php-config=%{__ztsphpconfig}
-make %{?_smp_mflags}
+%make_build
%endif
%install
%{?dtsenable}
-make -C NTS install INSTALL_ROOT=%{buildroot}
+%make_install -C NTS
# Install XML package description
install -Dpm 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
@@ -127,7 +115,7 @@ install -Dpm 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
install -Dpm644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
%if %{with_zts}
-make -C ZTS install INSTALL_ROOT=%{buildroot}
+%make_install -C ZTS
install -Dpm644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
%endif
@@ -160,28 +148,7 @@ REPORT_EXIT_STATUS=1 \
%endif
-%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
-
-
%files
-%{?_licensedir:%license %{sources}/LICENSE}
%doc %{pecl_docdir}/%{pecl_name}
%{pecl_xmldir}/%{name}.xml
@@ -195,6 +162,16 @@ fi
%changelog
+* Wed Jan 8 2025 Remi Collet <remi@remirepo.net> - 2.1.4-1
+- update to 2.1.4
+- raise dependency on PHP 7.1
+
+* Tue Jan 7 2025 Remi Collet <remi@remirepo.net> - 2.1.3-1
+- update to 2.1.3 (no change)
+
+* Thu Apr 4 2024 Remi Collet <remi@remirepo.net> - 2.1.2-1
+- update to 2.1.2
+
* Wed Aug 30 2023 Remi Collet <remi@remirepo.net> - 2.1.0-7
- rebuild for PHP 8.3.0RC1