diff options
| author | Remi Collet <remi@remirepo.net> | 2019-07-23 11:46:00 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-07-23 11:46:00 +0200 |
| commit | 4b200fa4df8c11ea9ec2ae89034e66a7295ce231 (patch) | |
| tree | 749d83796b3aa96ca9bdeb0dae1fd079d3e3c0f5 | |
| parent | b825787d84094a7bc9c71b4f7ea4ec3cdb4e18d2 (diff) | |
rebuild for 7.4.0beta1
| -rw-r--r-- | 135.patch | 22 | ||||
| -rw-r--r-- | php-pecl-cassandra.spec | 13 |
2 files changed, 31 insertions, 4 deletions
diff --git a/135.patch b/135.patch new file mode 100644 index 0000000..e4baad7 --- /dev/null +++ b/135.patch @@ -0,0 +1,22 @@ +From 84eb59673485cfcbb7c64a6916cd6a115915c233 Mon Sep 17 00:00:00 2001 +From: George Peter Banyard <girgias@php.net> +Date: Fri, 12 Jul 2019 14:58:00 +0200 +Subject: [PATCH] Convert php_error_docref0() to php_error_docref() + +--- + ext/src/Cluster/Builder.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ext/src/Cluster/Builder.c b/ext/src/Cluster/Builder.c +index 22c5c7b8..97ca0d87 100644 +--- a/ext/src/Cluster/Builder.c ++++ b/ext/src/Cluster/Builder.c +@@ -130,7 +130,7 @@ PHP_METHOD(ClusterBuilder, build) + rc = cass_cluster_set_use_hostname_resolution(cluster->cluster, self->enable_hostname_resolution); + if (rc == CASS_ERROR_LIB_NOT_IMPLEMENTED) { + if (self->enable_hostname_resolution) { +- php_error_docref0(NULL TSRMLS_CC, E_WARNING, ++ php_error_docref(NULL TSRMLS_CC, E_WARNING, + "The underlying C/C++ driver does not implement hostname resolution it will be disabled"); + } + } else { diff --git a/php-pecl-cassandra.spec b/php-pecl-cassandra.spec index 4b94b94..069d2af 100644 --- a/php-pecl-cassandra.spec +++ b/php-pecl-cassandra.spec @@ -32,7 +32,7 @@ Summary: DataStax PHP Driver for Apache Cassandra Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: 1.3.2 -Release: 6%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 7%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: ASL 2.0 URL: http://pecl.php.net/package/%{pecl_name} @@ -45,6 +45,7 @@ Source: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz Patch0: https://patch-diff.githubusercontent.com/raw/datastax/php-driver/pull/126.patch Patch1: https://patch-diff.githubusercontent.com/raw/datastax/php-driver/pull/132.patch +Patch2: https://patch-diff.githubusercontent.com/raw/datastax/php-driver/pull/135.patch BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 5.6 @@ -84,11 +85,11 @@ Obsoletes: php72u-pecl-%{pecl_name} <= %{version} Obsoletes: php72w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.3" -Obsoletes: php73-pecl-%{pecl_name} <= %{version} +Obsoletes: php73-pecl-%{pecl_name} <= %{version} Obsoletes: php73w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.4" -Obsoletes: php74-pecl-%{pecl_name} <= %{version} +Obsoletes: php74-pecl-%{pecl_name} <= %{version} Obsoletes: php74w-pecl-%{pecl_name} <= %{version} %endif %endif @@ -125,6 +126,7 @@ sed -e 's/role="test"/role="src"/' \ cd NTS %patch0 -p2 -b .pr126 %patch1 -p2 -b .pr132 +%patch2 -p2 -b .pr135 # Sanity check, really often broken extver=$(sed -n '/#define PHP_DRIVER_VERSION /{s/.* "//;s/".*$//;p}' version.h) @@ -259,7 +261,10 @@ REPORT_EXIT_STATUS=1 \ %changelog -* Wed May 29 2019 Remi Collet <remi@remirepo.net> - 1.3.2-6.7.2 +* Tue Jul 23 2019 Remi Collet <remi@remirepo.net> - 1.3.2-7 +- rebuild for 7.4.0beta1 + +* Wed May 29 2019 Remi Collet <remi@remirepo.net> - 1.3.2-6 - rebuild * Thu May 23 2019 Remi Collet <remi@remirepo.net> - 1.3.2-5 |