From 0a958b233827facfbb802c192ecaf781ce78414c Mon Sep 17 00:00:00 2001 From: Jonny Heggheim Date: Oct 25 2020 18:13:54 +0000 Subject: Updated to version 6.13.3 --- diff --git a/.gitignore b/.gitignore index 6a9a901..b99a6cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /rocksdb-5.2.1.tar.gz /rocksdb-5.7.3.tar.gz /rocksdb-6.11.4.tar.gz +/rocksdb-6.13.3.tar.gz diff --git a/001-accept-standard-varibles-for-install-location.patch b/001-accept-standard-varibles-for-install-location.patch deleted file mode 100644 index b267a36..0000000 --- a/001-accept-standard-varibles-for-install-location.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 886e369925172d9cf6f71ce28cc8af7c2b3ec06e Mon Sep 17 00:00:00 2001 -From: Jonny Heggheim -Date: Tue, 28 Jul 2020 19:46:01 +0200 -Subject: [PATCH] Modified Makefile to accept standard varibles for install - location, including DESTDIR for staged build - ---- - Makefile | 34 +++++++++++++++++++--------------- - 1 file changed, 19 insertions(+), 15 deletions(-) - -diff --git a/Makefile b/Makefile -index b36e0438f0..f9971447d6 100644 ---- a/Makefile -+++ b/Makefile -@@ -1788,33 +1788,37 @@ io_tracer_test: $(OBJ_DIR)/trace_replay/io_tracer_test.o $(OBJ_DIR)/trace_replay - - #------------------------------------------------- - # make install related stuff --INSTALL_PATH ?= /usr/local -+PREFIX ?= /usr/local -+LIBDIR ?= $(PREFIX)/lib -+INSTALL_LIBDIR = $(DESTDIR)$(LIBDIR) - - uninstall: -- rm -rf $(INSTALL_PATH)/include/rocksdb \ -- $(INSTALL_PATH)/lib/$(LIBRARY) \ -- $(INSTALL_PATH)/lib/$(SHARED4) \ -- $(INSTALL_PATH)/lib/$(SHARED3) \ -- $(INSTALL_PATH)/lib/$(SHARED2) \ -- $(INSTALL_PATH)/lib/$(SHARED1) -+ rm -rf $(DESTDIR)/$(PREFIX)/include/rocksdb \ -+ $(INSTALL_LIBDIR)/$(LIBRARY) \ -+ $(INSTALL_LIBDIR)/$(SHARED4) \ -+ $(INSTALL_LIBDIR)/$(SHARED3) \ -+ $(INSTALL_LIBDIR)/$(SHARED2) \ -+ $(INSTALL_LIBDIR)/$(SHARED1) - - install-headers: -- install -d $(INSTALL_PATH)/lib -+ install -d $(DESTDIR)/$(PREFIX)/include - for header_dir in `$(FIND) "include/rocksdb" -type d`; do \ -- install -d $(INSTALL_PATH)/$$header_dir; \ -+ install -d $(DESTDIR)/$(PREFIX)/$$header_dir; \ - done - for header in `$(FIND) "include/rocksdb" -type f -name *.h`; do \ -- install -C -m 644 $$header $(INSTALL_PATH)/$$header; \ -+ install -C -m 644 $$header $(DESTDIR)/$(PREFIX)/$$header; \ - done - - install-static: install-headers $(LIBRARY) -- install -C -m 755 $(LIBRARY) $(INSTALL_PATH)/lib -+ install -d $(INSTALL_LIBDIR) -+ 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 -d $(INSTALL_LIBDIR) -+ 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 diff --git a/rocksdb.spec b/rocksdb.spec index 190e29a..b187578 100644 --- a/rocksdb.spec +++ b/rocksdb.spec @@ -1,8 +1,8 @@ %global forgeurl https://github.com/facebook/rocksdb Name: rocksdb -Version: 6.11.4 -Release: 3%{?dist} +Version: 6.13.3 +Release: 1%{?dist} Summary: A Persistent Key-Value Store for Flash and RAM Storage License: GPLv2 or ASL 2.0 and BSD @@ -20,11 +20,6 @@ BuildRequires: make %forgemeta Source: %{forgesource} -#Modified Makefile to accept standard varibles for install -#location, including DESTDIR for staged build -#This have been merged into master https://github.com/facebook/rocksdb/commit/1e59800718b29d4a762b8ac356767a701f968a4d -Patch1: 001-accept-standard-varibles-for-install-location.patch - %description RocksDB is a library that forms the core building block for a fast key value server, especially suited for storing data on flash drives. It has a @@ -44,8 +39,6 @@ Development files for rocksdb %prep %forgesetup -%patch1 -p1 - %build %{set_build_flags} PORTABLE=1 USE_RTTI=1 %{make_build} shared_lib @@ -59,8 +52,8 @@ make install-shared PREFIX=%{_prefix} LIBDIR=%{_libdir} DESTDIR=%{buildroot} %license LICENSE.Apache %license LICENSE.leveldb %{_libdir}/librocksdb.so.6 -%{_libdir}/librocksdb.so.6.11 -%{_libdir}/librocksdb.so.6.11.4 +%{_libdir}/librocksdb.so.6.13 +%{_libdir}/librocksdb.so.6.13.3 %files devel @@ -69,9 +62,13 @@ make install-shared PREFIX=%{_prefix} LIBDIR=%{_libdir} DESTDIR=%{buildroot} %license LICENSE.Apache %license LICENSE.leveldb %{_libdir}/librocksdb.so +%{_libdir}/pkgconfig/rocksdb.pc %{_includedir}/rocksdb %changelog +* Sun Oct 25 2020 Jonny Heggheim - 6.13.3-1 +- Updated to version 6.13.3 + * Thu Sep 03 2020 Jonny Heggheim - 6.11.4-3 - Disable building on x86 due to compile errors diff --git a/sources b/sources index 2213ce7..8e86bd3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rocksdb-6.11.4.tar.gz) = 46ee38930aee58541366c92ca5cda48c2856292e5e3d66830035b05bb114b01d23ea2c8ee5e2abd971699f5c789adb6038971c3f07c8d68039ddea67d1357d05 +SHA512 (rocksdb-6.13.3.tar.gz) = 9c1a9de2321d86a454e4fddc72965c55352902d4f55fc2e5bdc8cc5f081e8a2251a431c29c7a6108504456b148c4244a18bab2b261aaad9afcf290ae9cd5d724