From 68a7ed1e4fbc8d148295fc42a61624a69afc44bd Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 15 Jan 2020 10:36:16 +0100
Subject: fix for cassandra-cpp-driver 2.15.0 with new headers location   from
 https://github.com/datastax/php-driver/pull/141

---
 php-pecl-cassandra.spec | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'php-pecl-cassandra.spec')

diff --git a/php-pecl-cassandra.spec b/php-pecl-cassandra.spec
index f71c80e..84fdabe 100644
--- a/php-pecl-cassandra.spec
+++ b/php-pecl-cassandra.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-pecl-cassandra
 #
-# Copyright (c) 2015-2019 Remi Collet
+# Copyright (c) 2015-2020 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -32,20 +32,21 @@
 Summary:      DataStax PHP Driver for Apache Cassandra
 Name:         %{?sub_prefix}php-pecl-%{pecl_name}
 Version:      1.3.2
-Release:      8%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:      9%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:      ASL 2.0
-URL:          http://pecl.php.net/package/%{pecl_name}
+URL:          https://pecl.php.net/package/%{pecl_name}
 
 # Pull sources from github to get tests
 %if 0%{?gh_commit:1}
 Source0:      https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever}.tar.gz
 %else
-Source:       http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
+Source:       https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 %endif
 
 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
+Patch3:       https://patch-diff.githubusercontent.com/raw/datastax/php-driver/pull/141.patch
 
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel >= 5.6
@@ -127,6 +128,7 @@ cd NTS
 %patch0 -p2 -b .pr126
 %patch1 -p2 -b .pr132
 %patch2 -p2 -b .pr135
+%patch3 -p2 -b .pr141
 
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_DRIVER_VERSION /{s/.* "//;s/".*$//;p}' version.h)
@@ -153,6 +155,8 @@ cp -pr NTS ZTS
 %build
 %{?dtsenable}
 
+export PHP_RPATH=no
+
 cd NTS
 %{_bindir}/phpize
 %configure  \
@@ -261,6 +265,10 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Wed Jan 15 2020 Remi Collet <remi@remirepo.net> - 1.3.2-9
+- fix for cassandra-cpp-driver 2.15.0 with new headers location
+  from https://github.com/datastax/php-driver/pull/141
+
 * Tue Sep 03 2019 Remi Collet <remi@remirepo.net> - 1.3.2-8
 - rebuild for 7.4.0RC1
 
-- 
cgit