[packages/kinetic-cpp-client] - updated system-libs patch to support current gflags (with gflags:: ns instead of google::) - insta

qboosh qboosh at pld-linux.org
Mon Feb 9 17:28:47 CET 2015


commit 27dcb35b2a347cfa7b67626e70b9115692cbadba
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Feb 9 17:31:16 2015 +0100

    - updated system-libs patch to support current gflags (with gflags:: ns instead of google::)
    - install missing autogenerated header (kinetic_client.pb.h)
    - release 2

 kinetic-cpp-client-system-libs.patch | 10 ++++++++++
 kinetic-cpp-client.spec              |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)
---
diff --git a/kinetic-cpp-client.spec b/kinetic-cpp-client.spec
index bfec651..0638435 100644
--- a/kinetic-cpp-client.spec
+++ b/kinetic-cpp-client.spec
@@ -6,7 +6,7 @@ Summary:	Kinetic C++ client library
 Summary(pl.UTF-8):	Biblioteka kliencka C++ Kinetic
 Name:		kinetic-cpp-client
 Version:	0.1.1
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Libraries
 Source0:	https://github.com/Seagate/kinetic-cpp-client/archive/%{version}/%{name}-%{version}.tar.gz
@@ -79,6 +79,7 @@ install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir}}
 
 install build/libkinetic_client.so $RPM_BUILD_ROOT%{_libdir}
 cp -pr include/kinetic $RPM_BUILD_ROOT%{_includedir}
+cp -p src/main/generated/kinetic_client.pb.h $RPM_BUILD_ROOT%{_includedir}/kinetic
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/kinetic-cpp-client-system-libs.patch b/kinetic-cpp-client-system-libs.patch
index ca5da5e..8548edf 100644
--- a/kinetic-cpp-client-system-libs.patch
+++ b/kinetic-cpp-client-system-libs.patch
@@ -164,3 +164,13 @@
  
  # Rule for running unit tests
  add_custom_target(check
+--- kinetic-cpp-client-0.1.1/src/test/kinetic_cpp_client_test.cc.orig	2014-09-18 02:14:04.000000000 +0200
++++ kinetic-cpp-client-0.1.1/src/test/kinetic_cpp_client_test.cc	2015-02-08 17:07:59.844379055 +0100
+@@ -41,6 +41,6 @@
+     int status = RUN_ALL_TESTS();
+     google::protobuf::ShutdownProtobufLibrary();
+     google::ShutdownGoogleLogging();
+-    google::ShutDownCommandLineFlags();
++    gflags::ShutDownCommandLineFlags();
+     return status;
+ }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kinetic-cpp-client.git/commitdiff/27dcb35b2a347cfa7b67626e70b9115692cbadba



More information about the pld-cvs-commit mailing list