From 2c75854f905400db5a71b21b71f66a2878f12da1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 18 Mar 2020 09:52:12 +0100 Subject: update to 2.15.1 drop patch merged upstream open https://github.com/datastax/cpp-driver/pull/472 fix CASS_INSTALL_HEADER_IN_SUBDIR usage --- cassandra-cpp-driver.spec | 17 +- compat_reports/2.15.0_to_2.15.1/compat_report.html | 521 +++++++++++++++++++++ cpp-driver-pc.patch | 20 - libcassandra.xml | 2 +- 4 files changed, 532 insertions(+), 28 deletions(-) create mode 100644 compat_reports/2.15.0_to_2.15.1/compat_report.html delete mode 100644 cpp-driver-pc.patch diff --git a/cassandra-cpp-driver.spec b/cassandra-cpp-driver.spec index 1db1e62..3b7ebb1 100644 --- a/cassandra-cpp-driver.spec +++ b/cassandra-cpp-driver.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # -%global gh_commit c97dd437c3730421f006dc4f2e36b533e405d357 +%global gh_commit fafe4bf5e71af184582244552923a7a062c6144b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner datastax %global gh_project cpp-driver @@ -17,7 +17,7 @@ Name: cassandra-cpp-driver Summary: DataStax C/C++ Driver for Apache Cassandra -Version: 2.15.0%{?prever:~%{prever}} +Version: 2.15.1%{?prever:~%{prever}} Release: 1%{?dist} License: ASL 2.0 Group: System Environment/Libraries @@ -25,11 +25,9 @@ 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 +BuildRequires: cmake >= 2.8.12 BuildRequires: libuv-devel >= 1:1.0 BuildRequires: openssl-devel BuildRequires: krb5-devel @@ -56,8 +54,6 @@ for %{name}. %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 -b .pr465 - find examples -name .gitignore -exec rm {} \; -print @@ -69,6 +65,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS -Wno-implicit-fallthrough" -DCASS_USE_KERBEROS:BOOL=ON \ -DCASS_USE_OPENSSL:BOOL=ON \ -DCASS_INSTALL_HEADER_IN_SUBDIR:BOOL=ON \ + -DCASS_INSTALL_HEADER_SUBDIR_NAME:STRING="cassandra" \ . make %{_smp_mflags} @@ -99,6 +96,12 @@ make install DESTDIR="%{buildroot}" %changelog +* Wed Mar 18 2020 Remi Collet - 2.15.1-1 +- update to 2.15.1 +- drop patch merged upstream +- open https://github.com/datastax/cpp-driver/pull/472 + fix CASS_INSTALL_HEADER_IN_SUBDIR usage + * Wed Jan 15 2020 Remi Collet - 2.15.0-1 - update to 2.15.0 - move headers in /usr/include/cassandra diff --git a/compat_reports/2.15.0_to_2.15.1/compat_report.html b/compat_reports/2.15.0_to_2.15.1/compat_report.html new file mode 100644 index 0000000..2633a4b --- /dev/null +++ b/compat_reports/2.15.0_to_2.15.1/compat_report.html @@ -0,0 +1,521 @@ + + + + + + + + + +libcassandra: 2.15.0 to 2.15.1 compatibility report + + + +

API compatibility report for the libcassandra library between 2.15.0 and 2.15.1 versions on x86_64

+ +
+
+ Binary
Compatibility + Source
Compatibility +
+

Test Info

+ + + + + + + +
Library Namelibcassandra
Version #12.15.0
Version #22.15.1
Archx86_64
GCC Version9
SubjectBinary Compatibility
+

Test Results

+ + + + + + +
Total Header Files2
Total Libraries1
Total Symbols / Types698 / 144
Compatibility100%
+

Problem Summary

+ + + + + + + + + +
SeverityCount
Added Symbols-0
Removed SymbolsHigh0
Problems with
Data Types		High0
Medium0
Low0
Problems with
Symbols		High0
Medium0
Low0
Problems with
Constants		Low0
+ +

Header Files  2 

+
+cassandra.h
+dse.h
+
+
to the top
+

Libraries  1 

+
+libcassandra.so.2.15.0
+
+
to the top
+


+

Test Info

+ + + + + + +
Library Namelibcassandra
Version #12.15.0
Version #22.15.1
Archx86_64
SubjectSource Compatibility
+

Test Results

+ + + + + + +
Total Header Files2
Total Libraries1
Total Symbols / Types698 / 144
Compatibility100%
+

Problem Summary

+ + + + + + + + + +
SeverityCount
Added Symbols-0
Removed SymbolsHigh0
Problems with
Data Types		High0
Medium0
Low0
Problems with
Symbols		High0
Medium0
Low0
Problems with
Constants		Low2
+ + +

Problems with Constants, Low Severity  2 

+cassandra.h
+ +[+] CASS_VERSION_PATCH +
+ + +
+dse.h
+ +[+] DSE_VERSION_PATCH +
+ + +
+to the top
+

Header Files  2 

+
+cassandra.h
+dse.h
+
+
to the top
+

Libraries  1 

+
+libcassandra.so.2.15.0
+
+
to the top
+


+
Generated by ABI Compliance Checker 2.3   +
+
+ + diff --git a/cpp-driver-pc.patch b/cpp-driver-pc.patch deleted file mode 100644 index 289e59f..0000000 --- a/cpp-driver-pc.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 6278d5fd1c3e939012dedf22ddc95545572f8eac Mon Sep 17 00:00:00 2001 -From: Remi Collet -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/ diff --git a/libcassandra.xml b/libcassandra.xml index 8abf111..b964f93 100644 --- a/libcassandra.xml +++ b/libcassandra.xml @@ -9,7 +9,7 @@ -2.15.0 +2.15.1 -- cgit