diff --git a/.gitignore b/.gitignore index e022b18..0d0e9f3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /LMDB_0.9.16.tar.gz /LMDB_0.9.17.tar.gz /LMDB_0.9.18.tar.gz +/LMDB_0.9.19.tar.gz diff --git a/lmdb-make.patch b/lmdb-make.patch index c59a359..eca03ef 100644 --- a/lmdb-make.patch +++ b/lmdb-make.patch @@ -1,26 +1,24 @@ -# Patch the main Makefile to allow for a build that complies to packaging guidelines. - -diff -up lmdb-LMDB_0.9.18/libraries/liblmdb/Makefile.oldmake lmdb-LMDB_0.9.18/libraries/liblmdb/Makefile ---- lmdb-LMDB_0.9.18/libraries/liblmdb/Makefile.oldmake 2016-02-10 11:25:58.609614905 +0100 -+++ lmdb-LMDB_0.9.18/libraries/liblmdb/Makefile 2016-02-10 11:28:27.100398910 +0100 +diff -up lmdb-LMDB_0.9.19/libraries/liblmdb/Makefile.orig lmdb-LMDB_0.9.19/libraries/liblmdb/Makefile +--- lmdb-LMDB_0.9.19/libraries/liblmdb/Makefile.orig 2017-01-04 12:14:24.303344915 +0100 ++++ lmdb-LMDB_0.9.19/libraries/liblmdb/Makefile 2017-01-04 12:19:20.190295319 +0100 @@ -26,6 +26,7 @@ OPT = -O2 -g CFLAGS = $(THREADS) $(OPT) $(W) $(XCFLAGS) LDLIBS = SOLIBS = +SOVERSION = 0.0.0 + SOEXT = .so prefix = /usr/local exec_prefix = $(prefix) - bindir = $(exec_prefix)/bin -@@ -37,7 +38,7 @@ mandir = $(datarootdir)/man +@@ -38,7 +39,7 @@ mandir = $(datarootdir)/man ######################################################################## IHDRS = lmdb.h --ILIBS = liblmdb.a liblmdb.so -+ILIBS = liblmdb.so liblmdb.so.$(SOVERSION) +-ILIBS = liblmdb.a liblmdb$(SOEXT) ++ILIBS = liblmdb$(SOEXT) liblmdb$(SOEXT).$(SOVERSION) IPROGS = mdb_stat mdb_copy mdb_dump mdb_load IDOCS = mdb_stat.1 mdb_copy.1 mdb_dump.1 mdb_load.1 PROGS = $(IPROGS) mtest mtest2 mtest3 mtest4 mtest5 -@@ -48,13 +49,13 @@ install: $(ILIBS) $(IPROGS) $(IHDRS) +@@ -49,13 +50,13 @@ install: $(ILIBS) $(IPROGS) $(IHDRS) mkdir -p $(DESTDIR)$(libdir) mkdir -p $(DESTDIR)$(includedir) mkdir -p $(DESTDIR)$(mandir)/man1 @@ -39,16 +37,16 @@ diff -up lmdb-LMDB_0.9.18/libraries/liblmdb/Makefile.oldmake lmdb-LMDB_0.9.18/li test: all rm -rf testdb && mkdir testdb -@@ -63,20 +64,24 @@ test: all +@@ -64,20 +65,24 @@ test: all liblmdb.a: mdb.o midl.o $(AR) rs $@ mdb.o midl.o --liblmdb.so: mdb.lo midl.lo -+liblmdb.so: liblmdb.so.$(SOVERSION) +-liblmdb$(SOEXT): mdb.lo midl.lo ++liblmdb$(SOEXT): liblmdb$(SOEXT).$(SOVERSION) + rm -f $@ + ln -s $< $@ + -+liblmdb.so.$(SOVERSION): mdb.lo midl.lo ++liblmdb$(SOEXT).$(SOVERSION): mdb.lo midl.lo # $(CC) $(LDFLAGS) -pthread -shared -Wl,-Bsymbolic -o $@ mdb.o midl.o $(SOLIBS) - $(CC) $(LDFLAGS) -pthread -shared -o $@ mdb.lo midl.lo $(SOLIBS) + $(CC) $(LDFLAGS) -pthread -shared -Wl,-soname,$@ -o $@ mdb.lo midl.lo $(SOLIBS) diff --git a/lmdb.spec b/lmdb.spec index 30b2ad0..e8e123f 100644 --- a/lmdb.spec +++ b/lmdb.spec @@ -2,7 +2,7 @@ %global archive_path libraries/lib%{name} Name: lmdb -Version: 0.9.18 +Version: 0.9.19 Release: 1%{?dist} Summary: Memory-mapped key-value database @@ -109,6 +109,9 @@ popd %changelog +* Wed Jan 04 2017 Jan Stanek - 0.9.19-1 +- Update to 0.9.19 + * Wed Feb 10 2016 Jan Stanek - 0.9.18-1 - Update to 0.9.18 diff --git a/sources b/sources index deccfdc..3503b39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8b7eeb8a6c30b2763581de455d10441b LMDB_0.9.18.tar.gz +SHA512 (LMDB_0.9.19.tar.gz) = 1d9825f09592ad92a540a1dec232cf6649f41cc67b0d59dc8958a71f4090f347c84995f32a166e2c2efecb862981f455814dd07af99bc3489e42fe3fd8bc6191