[packages/rocksdb] - updated to 3.13.1 (note: soname set/changed) - updated libdir patch

[qboosh]

commit b136638dfbc6ae3096741b464c0237d025466040
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Sep 15 19:00:28 2015 +0200

    - updated to 3.13.1 (note: soname set/changed)
    - updated libdir patch

 rocksdb-libdir.patch | 43 +++++++++++++++++++++++++++++--------------
 rocksdb.spec         | 16 ++++++++++++----
 2 files changed, 41 insertions(+), 18 deletions(-)
---
diff --git a/rocksdb.spec b/rocksdb.spec
index a771855..1bebbe8 100644
--- a/rocksdb.spec
+++ b/rocksdb.spec
@@ -6,12 +6,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.10.2
+Version:	3.13.1
 Release:	1
 License:	BSD
 Group:		Libraries
 Source0:	https://github.com/facebook/rocksdb/archive/%{name}-%{version}.tar.gz
-# Source0-md5:	6bdc1defb0a0d8e9e3cb11bfc6e795ef
+# Source0-md5:	2e0a6482ce1756bfdff73a0e09006a92
 Patch0:		%{name}-libdir.patch
 Patch1:		make-programs.patch
 URL:		http://rocksdb.org/
@@ -27,6 +27,9 @@ BuildRequires:	snappy-devel
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# std::__once_call, std::__once_callable non-function symbols
+%define		skip_post_check_so	librocksdb.so.*
+
 %description
 RocksDB is a Persistent Key-Value Store for Flash and RAM Storage.
 
@@ -78,7 +81,10 @@ PLATFORM_LDFLAGS="-latomic" \
 rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	INSTALL_PATH=$RPM_BUILD_ROOT%{_prefix} \
-	INSTALL_LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
+	INSTALL_LIBDIR=$RPM_BUILD_ROOT%{_libdir}
+
+# reduntant symlink
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/librocksdb.so.3
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -89,11 +95,13 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc HISTORY.md LICENSE PATENTS README.md ROCKSDB_LITE.md
-%attr(755,root,root) %{_libdir}/librocksdb.so
+%attr(755,root,root) %{_libdir}/librocksdb.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/librocksdb.so.3.13
 
 %files devel
 %defattr(644,root,root,755)
 %doc doc/*
+%attr(755,root,root) %{_libdir}/librocksdb.so
 %{_includedir}/rocksdb
 
 %if %{with static_libs}
diff --git a/rocksdb-libdir.patch b/rocksdb-libdir.patch
index d18c78f..5ef3efd 100644
--- a/rocksdb-libdir.patch
+++ b/rocksdb-libdir.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- rocksdb-rocksdb-3.13.1/Makefile.orig	2015-09-14 21:39:12.629620988 +0200
++++ rocksdb-rocksdb-3.13.1/Makefile	2015-09-15 15:38:46.103569369 +0200
+@@ -928,17 +928,18 @@
  #-------------------------------------------------
  # make install related stuff
  INSTALL_PATH ?= /usr/local
@@ -9,23 +9,38 @@
  uninstall:
  	rm -rf $(INSTALL_PATH)/include/rocksdb \
 -	  $(INSTALL_PATH)/lib/$(LIBRARY) \
--	  $(INSTALL_PATH)/lib/$(SHARED)
+-	  $(INSTALL_PATH)/lib/$(SHARED4) \
+-	  $(INSTALL_PATH)/lib/$(SHARED3) \
+-	  $(INSTALL_PATH)/lib/$(SHARED2) \
+-	  $(INSTALL_PATH)/lib/$(SHARED1)
 +	  $(INSTALL_LIBDIR)/$(LIBRARY) \
-+	  $(INSTALL_LIBDIR)/$(SHARED)
++	  $(INSTALL_LIBDIR)/$(SHARED4) \
++	  $(INSTALL_LIBDIR)/$(SHARED3) \
++	  $(INSTALL_LIBDIR)/$(SHARED2) \
++	  $(INSTALL_LIBDIR)/$(SHARED1)
  
- install:
+ install-headers:
 -	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 \
- 		install -C -m 644 $$header $(INSTALL_PATH)/$$header; \
+@@ -947,13 +948,13 @@
  	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 644 $(SHARED) $(INSTALL_LIBDIR)
- #-------------------------------------------------
  
- WARNING_FLAGS = -W -Wextra -Wall -Wsign-compare -Wshadow \
+ install-static: install-headers $(LIBRARY)
+-	install -C -m 755 $(LIBRARY) $(INSTALL_PATH)/lib
++	install -C -m 755 $(LIBRARY) $(INSTALL_LIBDIR)
+ 
+ install-shared: install-headers $(SHARED4)
+-	install -C -m 755 $(SHARED4) $(INSTALL_PATH)/lib && \
+-		ln -fs $(SHARED4) $(INSTALL_PATH)/lib/$(SHARED3) && \
+-		ln -fs $(SHARED4) $(INSTALL_PATH)/lib/$(SHARED2) && \
+-		ln -fs $(SHARED4) $(INSTALL_PATH)/lib/$(SHARED1)
++	install -C -m 755 $(SHARED4) $(INSTALL_LIBDIR) && \
++		ln -fs $(SHARED4) $(INSTALL_LIBDIR)/$(SHARED3) && \
++		ln -fs $(SHARED4) $(INSTALL_LIBDIR)/$(SHARED2) && \
++		ln -fs $(SHARED4) $(INSTALL_LIBDIR)/$(SHARED1)
+ 
+ # install static by default + install shared if it exists
+ install: install-static
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rocksdb.git/commitdiff/b136638dfbc6ae3096741b464c0237d025466040