From: Elan Ruusamäe <glen@delfi.ee>
Date: Mon, 3 Aug 2015 06:55:07 +0000 (+0300)
Subject: up to 3.10.2
X-Git-Tag: auto/th/rocksdb-3.13.1-1~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frocksdb.git;a=commitdiff_plain;h=83ab867;ds=sidebyside

up to 3.10.2
---

diff --git a/rocksdb-libdir.patch b/rocksdb-libdir.patch
index ce3a213..d18c78f 100644
--- a/rocksdb-libdir.patch
+++ b/rocksdb-libdir.patch
@@ -1,31 +1,31 @@
---- rocksdb-rocksdb-3.5.1/Makefile.orig	2014-10-08 19:21:10.000000000 +0200
-+++ rocksdb-rocksdb-3.5.1/Makefile	2014-10-18 22:15:15.521010930 +0200
-@@ -51,22 +51,23 @@
+--- rocksdb-rocksdb-3.10.2/Makefile~	2015-05-02 02:45:34.000000000 +0300
++++ rocksdb-rocksdb-3.10.2/Makefile	2015-07-27 11:30:48.212446388 +0300
+@@ -117,22 +117,23 @@
  #-------------------------------------------------
  # make install related stuff
  INSTALL_PATH ?= /usr/local
 +INSTALL_LIBDIR ?= $(INSTALL_PATH)/lib
  
  uninstall:
- 	@rm -rf $(INSTALL_PATH)/include/rocksdb
--	@rm -rf $(INSTALL_PATH)/lib/$(LIBRARY)
--	@rm -rf $(INSTALL_PATH)/lib/$(SHARED)
-+	@rm -rf $(INSTALL_LIBDIR)/$(LIBRARY)
-+	@rm -rf $(INSTALL_LIBDIR)/$(SHARED)
+ 	rm -rf $(INSTALL_PATH)/include/rocksdb \
+-	  $(INSTALL_PATH)/lib/$(LIBRARY) \
+-	  $(INSTALL_PATH)/lib/$(SHARED)
++	  $(INSTALL_LIBDIR)/$(LIBRARY) \
++	  $(INSTALL_LIBDIR)/$(SHARED)
  
  install:
--	@install -d $(INSTALL_PATH)/lib
-+	@install -d $(INSTALL_LIBDIR)
- 	@for header_dir in `find "include/rocksdb" -type d`; do \
+-	install -d $(INSTALL_PATH)/lib
++	install -d $(INSTALL_LIBDIR)
+ 	for header_dir in `find "include/rocksdb" -type d`; do \
  		install -d $(INSTALL_PATH)/$$header_dir; \
  	done
- 	@for header in `find "include/rocksdb" -type f -name *.h`; do \
+ 	for header in `find "include/rocksdb" -type f -name *.h`; do \
  		install -C -m 644 $$header $(INSTALL_PATH)/$$header; \
  	done
--	@[ ! -e $(LIBRARY) ] || install -C -m 644 $(LIBRARY) $(INSTALL_PATH)/lib
--	@[ ! -e $(SHARED) ] || install -C -m 644 $(SHARED) $(INSTALL_PATH)/lib
-+	@[ ! -e $(LIBRARY) ] || install -C -m 644 $(LIBRARY) $(INSTALL_LIBDIR)
-+	@[ ! -e $(SHARED) ] || install -C -m 755 $(SHARED) $(INSTALL_LIBDIR)
+-	[ ! -e $(LIBRARY) ] || install -C -m 644 $(LIBRARY) $(INSTALL_PATH)/lib
+-	[ ! -e $(SHARED) ] || install -C -m 644 $(SHARED) $(INSTALL_PATH)/lib
++	[ ! -e $(LIBRARY) ] || install -C -m 644 $(LIBRARY) $(INSTALL_LIBDIR)
++	[ ! -e $(SHARED) ] || install -C -m 644 $(SHARED) $(INSTALL_LIBDIR)
  #-------------------------------------------------
  
- WARNING_FLAGS = -Wall -Werror -Wsign-compare
+ WARNING_FLAGS = -W -Wextra -Wall -Wsign-compare -Wshadow \
diff --git a/rocksdb.spec b/rocksdb.spec
index bbf80eb..2e7e2cc 100644
--- a/rocksdb.spec
+++ b/rocksdb.spec
@@ -1,12 +1,12 @@
 Summary:	RocksDB: A Persistent Key-Value Store for Flash and RAM Storage
 Summary(pl.UTF-8):	RocksDB - trwała baza danych klucz-wartość dla pamięci Flash i RAM
 Name:		rocksdb
-Version:	3.9.1
+Version:	3.10.2
 Release:	1
 License:	BSD
 Group:		Libraries
 Source0:	https://github.com/facebook/rocksdb/archive/%{name}-%{version}.tar.gz
-# Source0-md5:	b759d264fda5f66001b092d6be311c58
+# Source0-md5:	6bdc1defb0a0d8e9e3cb11bfc6e795ef
 Patch0:		%{name}-libdir.patch
 URL:		http://rocksdb.org/
 BuildRequires:	bzip2-devel
@@ -61,6 +61,7 @@ Statyczna biblioteka RocksDB.
 PLATFORM_LDFLAGS="-latomic" \
 %endif
 %{__make} all shared_lib \
+	AM_DEFAULT_VERBOSITY=1 \
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
 	OPT="%{rpmcflags} %{!?debug:-DNDEBUG}" \