- updated to 0.9.18

- updated make patch
- pl
- added -static and -apidocs subpackages

diff --git a/lmdb-make.patch b/lmdb-make.patch
index f573029ae72e197f261949474eb67e6f558fa509..8b33eb5d0f2cae81e0596a1665fe3b8e280e3230 100644 (file)
--- a/lmdb-make.patch
+++ b/lmdb-make.patch
@@ -1,48 +1,36 @@
 # Patch the main Makefile to allow for a build that complies to packaging guidelines.
 
-diff -up lmdb-LMDB_0.9.16/libraries/liblmdb/Makefile.upstream lmdb-LMDB_0.9.16/libraries/liblmdb/Makefile
---- lmdb-LMDB_0.9.16/libraries/liblmdb/Makefile.upstream       2015-08-14 10:59:31.179144608 +0200
-+++ lmdb-LMDB_0.9.16/libraries/liblmdb/Makefile        2015-08-14 11:05:57.763026045 +0200
-@@ -24,25 +24,30 @@ OPT = -O2 -g
+--- lmdb-LMDB_0.9.18/libraries/liblmdb/Makefile.upstream       2015-08-14 10:59:31.179144608 +0200
++++ lmdb-LMDB_0.9.18/libraries/liblmdb/Makefile        2015-08-14 11:05:57.763026045 +0200
+@@ -26,6 +26,7 @@
  CFLAGS        = $(THREADS) $(OPT) $(W) $(XCFLAGS)
  LDLIBS        =
  SOLIBS        =
 +SOVERSION = 0
  prefix        = /usr/local
-+binprefix = $(prefix)/bin                                                                     
-+libprefix = $(prefix)/lib              
-+includeprefix = $(prefix)/include
-+manprefix = $(prefix)/man
- 
+ exec_prefix = $(prefix)
+ bindir = $(exec_prefix)/bin
+@@ -37,7 +38,7 @@
  ########################################################################
  
  IHDRS = lmdb.h
 -ILIBS = liblmdb.a liblmdb.so
-+ILIBS = liblmdb.so liblmdb.so.$(SOVERSION)
++ILIBS = liblmdb.a liblmdb.so liblmdb.so.$(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
- all:  $(ILIBS) $(PROGS)
- 
- install: $(ILIBS) $(IPROGS) $(IHDRS)
--      for f in $(IPROGS); do cp $$f $(DESTDIR)$(prefix)/bin; done
--      for f in $(ILIBS); do cp $$f $(DESTDIR)$(prefix)/lib; done
--      for f in $(IHDRS); do cp $$f $(DESTDIR)$(prefix)/include; done
--      for f in $(IDOCS); do cp $$f $(DESTDIR)$(prefix)/man/man1; done
-+      for f in $(IPROGS); do cp $$f $(DESTDIR)$(binprefix); done
-+      for f in $(ILIBS); do cp -d $$f $(DESTDIR)$(libprefix); done
-+      for f in $(IHDRS); do cp $$f $(DESTDIR)$(includeprefix); done
-+      for f in $(IDOCS); do cp $$f $(DESTDIR)$(manprefix)/man1; done
+@@ -54,7 +55,7 @@
+       for f in $(IDOCS); do cp $$f $(DESTDIR)$(mandir)/man1; done
  
  clean:
 -      rm -rf $(PROGS) *.[ao] *.[ls]o *~ testdb
-+      rm -rf $(PROGS) *.[ao] *.[ls]o* *~ testdb
++      rm -rf $(PROGS) *.[ao] *.[ls]o *.so.* *~ testdb
  
  test: all
        rm -rf testdb && mkdir testdb
-@@ -51,20 +56,24 @@ test:      all
+@@ -63,20 +64,24 @@
  liblmdb.a:    mdb.o midl.o
-       ar rs $@ mdb.o midl.o
+       $(AR) rs $@ mdb.o midl.o
  
 -liblmdb.so:   mdb.lo midl.lo
 +liblmdb.so:   liblmdb.so.$(SOVERSION)

diff --git a/lmdb.spec b/lmdb.spec
index b7978335f94945ea00b4ddfd49aab9c294ff7edd..45442d491243efa7ad54c6b7317b946955f73398 100644 (file)
--- a/lmdb.spec
+++ b/lmdb.spec
@@ -3,16 +3,19 @@
 %bcond_without tests           # build without tests
 
 Summary:       Memory-mapped key-value database
+Summary(pl.UTF-8):     Baza danych klucz-wartość odwzorowywana w pamięci
 Name:          lmdb
-Version:       0.9.16
-Release:       2
+Version:       0.9.18
+Release:       1
 License:       OpenLDAP
-Group:         Libraries
+Group:         Applications/Databases
+#Source0Download: https://github.com/LMDB/lmdb/releases
 Source0:       https://github.com/LMDB/lmdb/archive/LMDB_%{version}.tar.gz
-# Source0-md5: 0de89730b8f3f5711c2b3a4ba517b648
-URL:           http://symas.com/mdb/
+# Source0-md5: 8b7eeb8a6c30b2763581de455d10441b
 Patch0:                %{name}-make.patch
+URL:           http://symas.com/mdb/
 BuildRequires: doxygen
+Requires:      %{name}-libs = %{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -22,27 +25,69 @@ it provides the read performance of a pure in-memory database while
 still offering the persistence of standard disk-based databases, and
 is only limited to the size of the virtual address space.
 
+%description -l pl.UTF-8
+LMDB to bardzo szybka i zwarta, wbudowana baza danych klucz-wartość
+rozwijana dla projektu OpenLDAP. Dzięki użyciu plików odwzorowywanych
+w pamięci zapewnia wydajność odczytu analogiczną do bazydanych
+trzymanej w pamięci, oferując jednocześnie trwałość charakterystyczną
+dla baz opartych na dysku oraz ograniczenie wyłącznie rozmiarem
+wirtualnej przestrzeni adresowej.
+
 %package libs
-Summary:       Shared libraries for %{name}
+Summary:       LMDB shared library
+Summary(pl.UTF-8):     Biblioteka współdzielona LMDB
 Group:         Libraries
 
 %description libs
-The %{name}-libs package contains shared libraries necessary for
-running applications that use %{name}.
+This package contains the shared library necessary for running
+applications that use LMDB.
+
+%description libs -l pl.UTF-8
+Ten pakiet zawiera bibliotekę współdzieloną konieczną do uruchamiania
+aplikacji wykorzystujących LMDB.
 
 %package devel
-Summary:       Development files for %{name}
+Summary:       Header files for LMDB library
+Summary(pl.UTF-8):     Plik nagłówkowy LMDB
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 
 %description devel
-The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
+This package contains the header file for developing applications that
+use LMDB.
+
+%description devel -l pl.UTF-8
+Ten pakiet zawiera plik nagłówkowy do tworzenia aplikacji
+wykorzystujących LMDB.
+
+%package static
+Summary:       Static LMDB library
+Summary(pl.UTF-8):     Statyczna biblioteka LMDB
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+
+%description static
+Static LMDB library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka LMDB.
+
+%package apidocs
+Summary:       LMDB API documentation
+Summary(pl.UTF-8):     Dokumentacja API biblioteki LMDB
+Group:         Documentation
+
+%description apidocs
+LMDB API documentation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki LMDB.
 
 %prep
 %setup -q -n %{name}-LMDB_%{version}
-mv libraries/liblmdb/* .
-%patch0 -p3
+%patch0 -p1
+
+%{__mv} libraries/liblmdb/* .
 
 %build
 %{__make} \
@@ -56,9 +101,6 @@ LD_LIBRARY_PATH=$PWD %{__make} test
 
 # Build doxygen documentation
 doxygen
-# remove unpackaged files
-rm -f Doxyfile
-rm -rf man # Doxygen generated manpages
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -69,11 +111,10 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir},%{_libdir},%{_mandir}/man1}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
        prefix=%{_prefix} \
-       libprefix=%{_libdir} \
-       manprefix=%{_mandir}
+       libdir=%{_libdir}
 
 # rename to have typical 0.0.0 file
-mv $RPM_BUILD_ROOT%{_libdir}/liblmdb.so.{0,0.0.0}
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/liblmdb.so.{0,0.0.0}
 /sbin/ldconfig -n  $RPM_BUILD_ROOT%{_libdir}
 
 %clean
@@ -101,5 +142,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/lmdb.h
 %attr(755,root,root) %{_libdir}/liblmdb.so
+%{_includedir}/lmdb.h
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/liblmdb.a
+
+%files apidocs
+%defattr(644,root,root,755)
+%doc html/*