summaryrefslogtreecommitdiffstats
path: root/php-pecl-cassandra.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-09-16 17:25:46 +0200
committerRemi Collet <remi@php.net>2022-09-16 17:25:46 +0200
commitb48275810b220667d104a91b0285aa67150773ee (patch)
treea9931b466a948c848842de65dadb049e03fcddcd /php-pecl-cassandra.spec
parentecc2bd63be0045d4870f43f5fdc7f1b35f60f9e7 (diff)
add patch for PHP 8.2 from
https://github.com/nano-interactive/cassandra-php-driver/pull/36
Diffstat (limited to 'php-pecl-cassandra.spec')
-rw-r--r--php-pecl-cassandra.spec15
1 files changed, 8 insertions, 7 deletions
diff --git a/php-pecl-cassandra.spec b/php-pecl-cassandra.spec
index c6a5e07..f222a51 100644
--- a/php-pecl-cassandra.spec
+++ b/php-pecl-cassandra.spec
@@ -8,7 +8,6 @@
#
%if 0%{?scl:1}
-%global sub_prefix %{scl_prefix}
%scl_package php-pecl-cassandra
%endif
@@ -32,9 +31,9 @@
%global buildver %(pkg-config --silence-errors --modversion cassandra 2>/dev/null || echo 65536)
Summary: DataStax PHP Driver for Apache Cassandra
-Name: %{?sub_prefix}php-pecl-%{pecl_name}
+Name: %{?scl_prefix}php-pecl-%{pecl_name}
Version: 1.3.2
-Release: 10%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 11%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: ASL 2.0
URL: https://pecl.php.net/package/%{pecl_name}
@@ -52,6 +51,7 @@ Patch3: https://patch-diff.githubusercontent.com/raw/datastax/php-driver/p
# Fix for PHP 8 from https://github.com/nano-interactive/cassandra-php-driver/commits/v1.3.x/ext
Patch4: %{pecl_name}-php8.patch
Patch5: https://patch-diff.githubusercontent.com/raw/nano-interactive/cassandra-php-driver/pull/29.patch
+Patch6: https://patch-diff.githubusercontent.com/raw/nano-interactive/cassandra-php-driver/pull/36.patch
BuildRequires: make
BuildRequires: %{?dtsprefix}gcc
@@ -70,10 +70,6 @@ Provides: %{?scl_prefix}php-%{pecl_name} = %{version}
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 "%{?scl_prefix}" != "%{?sub_prefix}"
-Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release}
-Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release}
-%endif
%description
@@ -106,6 +102,7 @@ cd NTS
%if "%{php_version}" > "8.0"
%patch4 -p2 -b .php8
%patch5 -p2 -b .php81
+%patch6 -p2 -b .php82
%endif
# Sanity check, really often broken
@@ -243,6 +240,10 @@ REPORT_EXIT_STATUS=1 \
%changelog
+* Fri Sep 16 2022 Remi Collet <remi@remirepo.net> - 1.3.2-11
+- add patch for PHP 8.2 from
+ https://github.com/nano-interactive/cassandra-php-driver/pull/36
+
* Wed Jun 15 2022 Remi Collet <remi@remirepo.net> - 1.3.2-10
- add patch for PHP 8 from extension fork
https://github.com/nano-interactive/cassandra-php-driver/