summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cassandra-cpp-driver.spec5
-rw-r--r--cpp-driver-pc.patch20
2 files changed, 25 insertions, 0 deletions
diff --git a/cassandra-cpp-driver.spec b/cassandra-cpp-driver.spec
index c2a3757..1db1e62 100644
--- a/cassandra-cpp-driver.spec
+++ b/cassandra-cpp-driver.spec
@@ -25,6 +25,8 @@ Group: System Environment/Libraries
URL: http://datastax.github.io/cpp-driver/
Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever:-%{prever}}-%{gh_short}.tar.gz
+Patch0: %{gh_project}-pc.patch
+
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: cmake >= 2.6.4
@@ -54,6 +56,7 @@ for %{name}.
%prep
%setup -q -n %{gh_project}-%{gh_commit}
+%patch0 -p1 -b .pr465
find examples -name .gitignore -exec rm {} \; -print
@@ -100,6 +103,8 @@ make install DESTDIR="%{buildroot}"
- update to 2.15.0
- move headers in /usr/include/cassandra
- enable Kerberos support
+- fix pkg-config file with patch from
+ https://github.com/datastax/cpp-driver/pull/465
* Thu Dec 12 2019 Remi Collet <remi@remirepo.net> - 2.14.1-1
- update to 2.14.1
diff --git a/cpp-driver-pc.patch b/cpp-driver-pc.patch
new file mode 100644
index 0000000..289e59f
--- /dev/null
+++ b/cpp-driver-pc.patch
@@ -0,0 +1,20 @@
+From 6278d5fd1c3e939012dedf22ddc95545572f8eac Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Wed, 15 Jan 2020 09:48:51 +0100
+Subject: [PATCH] fix cflags when build with CASS_INSTALL_HEADER_IN_SUBDIR on
+
+---
+ packaging/cassandra.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/packaging/cassandra.pc.in b/packaging/cassandra.pc.in
+index afc906516..52ff626c1 100644
+--- a/packaging/cassandra.pc.in
++++ b/packaging/cassandra.pc.in
+@@ -7,5 +7,5 @@ Name: cassandra
+ Description: A C/C++ client driver for Apache Cassandra and DataStax Products
+ Version: @version@
+ Libs: -L${libdir} -l@PROJECT_LIB_NAME@
+-Cflags:
++Cflags: -I${includedir}
+ URL: https://github.com/datastax/cpp-driver/