- updated to 5.2.1 (note: new soname)

- updated detect-flags patch

diff --git a/rocksdb-detect-flags.patch b/rocksdb-detect-flags.patch
index 9b54fe68f84be7ae46c1d476d1fb964ac32251b7..8bcac1edd9fd2a63f19c458efc7df1d28cc63a6b 100644 (file)
--- a/rocksdb-detect-flags.patch
+++ b/rocksdb-detect-flags.patch
@@ -1,11 +1,11 @@
---- rocksdb-rocksdb-4.13.5/Makefile.orig       2016-12-26 19:15:47.176657758 +0100
-+++ rocksdb-rocksdb-4.13.5/Makefile    2016-12-26 19:30:42.149980874 +0100
-@@ -137,7 +137,7 @@
+--- rocksdb-rocksdb-5.2.1/Makefile.orig        2017-04-28 19:57:40.787056551 +0200
++++ rocksdb-rocksdb-5.2.1/Makefile     2017-04-28 19:58:43.773722499 +0200
+@@ -140,7 +140,7 @@

  
  AM_LINK = $(AM_V_CCLD)$(CXX) $^ $(EXEC_LDFLAGS) -o $@ $(LDFLAGS) $(COVERAGEFLAGS)
  # detect what platform we're building on
  
  AM_LINK = $(AM_V_CCLD)$(CXX) $^ $(EXEC_LDFLAGS) -o $@ $(LDFLAGS) $(COVERAGEFLAGS)
  # detect what platform we're building on

--dummy := $(shell (export ROCKSDB_ROOT="$(CURDIR)"; "$(CURDIR)/build_tools/build_detect_platform" "$(CURDIR)/make_config.mk"))
-+dummy := $(shell (export ROCKSDB_ROOT="$(CURDIR)" CFLAGS="$(CFLAGS)"; "$(CURDIR)/build_tools/build_detect_platform" "$(CURDIR)/make_config.mk"))
+-dummy := $(shell (export ROCKSDB_ROOT="$(CURDIR)"; export PORTABLE="$(PORTABLE)"; "$(CURDIR)/build_tools/build_detect_platform" "$(CURDIR)/make_config.mk"))
++dummy := $(shell (export ROCKSDB_ROOT="$(CURDIR)" CFLAGS="$(CFLAGS)"; export PORTABLE="$(PORTABLE)"; "$(CURDIR)/build_tools/build_detect_platform" "$(CURDIR)/make_config.mk"))

  # this file is generated by the previous line to set build flags and sources
  include make_config.mk
  CLEAN_FILES += make_config.mk
  # this file is generated by the previous line to set build flags and sources
  include make_config.mk
  CLEAN_FILES += make_config.mk

diff --git a/rocksdb.spec b/rocksdb.spec
index 8972a4e08464f098ecfdb53eafa236bd0b32cdd6..86e305c51515a850ce3c746cfb4152d9466cf6e2 100644 (file)
--- a/rocksdb.spec
+++ b/rocksdb.spec
@@ -7,13 +7,13 @@
 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
 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:       4.13.5
+Version:       5.2.1

 Release:       1
 License:       BSD
 Group:         Libraries
 #Source0Download: https://github.com/facebook/rocksdb/releases
 Source0:       https://github.com/facebook/rocksdb/archive/%{name}-%{version}.tar.gz
 Release:       1
 License:       BSD
 Group:         Libraries
 #Source0Download: https://github.com/facebook/rocksdb/releases
 Source0:       https://github.com/facebook/rocksdb/archive/%{name}-%{version}.tar.gz

-# Source0-md5: f94191cf37221c4541dfb4d7f544651e
+# Source0-md5: 843b4360dbe3d3869c95d3001644dc41

 Patch0:                %{name}-libdir.patch
 Patch1:                make-programs.patch
 Patch2:                %{name}-jemalloc.patch
 Patch0:                %{name}-libdir.patch
 Patch1:                make-programs.patch
 Patch2:                %{name}-jemalloc.patch


@@ -98,7 +98,7 @@ rm -rf $RPM_BUILD_ROOT
        INSTALL_LIBDIR=$RPM_BUILD_ROOT%{_libdir}
 
 # reduntant symlink
        INSTALL_LIBDIR=$RPM_BUILD_ROOT%{_libdir}
 
 # reduntant symlink

-%{__rm} $RPM_BUILD_ROOT%{_libdir}/librocksdb.so.4
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/librocksdb.so.5

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT


@@ -110,7 +110,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS DEFAULT_OPTIONS_HISTORY.md DUMP_FORMAT.md HISTORY.md LANGUAGE-BINDINGS.md LICENSE PATENTS README.md ROCKSDB_LITE.md USERS.md
 %attr(755,root,root) %{_libdir}/librocksdb.so.*.*.*
 %defattr(644,root,root,755)
 %doc AUTHORS DEFAULT_OPTIONS_HISTORY.md DUMP_FORMAT.md HISTORY.md LANGUAGE-BINDINGS.md LICENSE PATENTS README.md ROCKSDB_LITE.md USERS.md
 %attr(755,root,root) %{_libdir}/librocksdb.so.*.*.*

-%attr(755,root,root) %ghost %{_libdir}/librocksdb.so.4.13
+%attr(755,root,root) %ghost %{_libdir}/librocksdb.so.5.2

 
 %files devel
 %defattr(644,root,root,755)
 
 %files devel
 %defattr(644,root,root,755)