- updated to 1.13

- updated info patch
- added export patch (fix gdbmexport build)
- added link patch (avoid useless linking with system libndbm or libdbm if found)

diff --git a/gdbm-export.patch b/gdbm-export.patch
new file mode 100644 (file)
index 0000000..51a3c22
--- /dev/null
+++ b/gdbm-export.patch
@@ -0,0 +1,26 @@
+--- gdbm-1.13/export/export.c.orig     2017-01-02 12:51:49.000000000 +0100
++++ gdbm-1.13/export/export.c  2017-04-10 21:29:05.764751534 +0200
+@@ -23,6 +23,7 @@
+ 
+ #include <gdbm.h>
+ 
++#define GDBM_EXPORT_18
+ /* Pull in gdbm_export() */
+ #include "gdbmexp.c"
+ 
+--- gdbm-1.13/src/gdbmexp.c.orig       2017-01-02 12:51:49.000000000 +0100
++++ gdbm-1.13/src/gdbmexp.c    2017-04-10 21:35:32.624747118 +0200
+@@ -21,8 +21,13 @@
+ # include "autoconf.h"
+ # include <arpa/inet.h>
+ 
++#ifdef GDBM_EXPORT_18
++# define GDBM_SET_ERRNO(dbf, ec, fatal) gdbm_errno = ec
++# define GDBM_ASSERT_CONSISTENCY(dbf, val)
++#else
+ # include "gdbmdefs.h"
+ # include "gdbm.h"
++#endif
+ 
+ int
+ gdbm_export_to_file (GDBM_FILE dbf, FILE *fp)

diff --git a/gdbm-info.patch b/gdbm-info.patch
index 208c1e0aab80b54aa25e2730256e58657e648795..60c79bcae5dcfea1311b5d07be1056d6e2e9a2df 100644 (file)
--- a/gdbm-info.patch
+++ b/gdbm-info.patch
@@ -1,5 +1,5 @@
---- gdbm-1.12/doc/gdbm.texinfo.orig    2016-05-21 17:19:34.711227665 +0200
-+++ gdbm-1.12/doc/gdbm.texinfo 2016-05-21 17:20:33.357891871 +0200
+--- gdbm-1.13/doc/gdbm.texi.orig       2016-05-21 17:19:34.711227665 +0200
++++ gdbm-1.13/doc/gdbm.texi    2016-05-21 17:20:33.357891871 +0200
 @@ -6,11 +6,11 @@
  @settitle GDBM manual
  

diff --git a/gdbm-link.patch b/gdbm-link.patch
new file mode 100644 (file)
index 0000000..9bc0b49
--- /dev/null
+++ b/gdbm-link.patch
@@ -0,0 +1,11 @@
+--- gdbm-1.13/configure.ac.orig        2017-03-11 17:12:35.000000000 +0100
++++ gdbm-1.13/configure.ac     2017-04-10 21:43:11.431408546 +0200
+@@ -105,8 +105,6 @@
+ 
+ AC_CHECK_HEADERS([sys/file.h sys/termios.h string.h locale.h getopt.h])
+ 
+-AC_CHECK_LIB(dbm, main)
+-AC_CHECK_LIB(ndbm, main)
+ AC_CHECK_FUNCS([ftruncate flock lockf fsync setlocale getopt_long])
+ 
+ if test x$mapped_io = xyes

diff --git a/gdbm.spec b/gdbm.spec
index 5354f4803b03e33d1c101d8f23ee6b48edcbc6e0..6432430f8606a81a31c4231a80c1b2742ec8e54a 100644 (file)
--- a/gdbm.spec
+++ b/gdbm.spec
@@ -9,19 +9,23 @@ Summary(pl.UTF-8):    Biblioteka GNU bazy danych dla języka C
 Summary(ru.UTF-8):     Библиотека базы данных GNU для C
 Summary(uk.UTF-8):     Бібліотека бази даних GNU для C
 Name:          gdbm
-Version:       1.12
+Version:       1.13
 Release:       1
 License:       GPL v3+
 Group:         Libraries
 Source0:       http://ftp.gnu.org/gnu/gdbm/%{name}-%{version}.tar.gz
-# Source0-md5: 9ce96ff4c99e74295ea19040931c8fb9
+# Source0-md5: 8929dcda2a8de3fd2367bdbf66769376
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-link-compat.patch
-BuildRequires: autoconf >= 2.63
+Patch2:                %{name}-export.patch
+Patch3:                %{name}-link.patch
+URL:           http://www.gnu.org/software/gdbm/
+BuildRequires: autoconf >= 2.69
 BuildRequires: automake >= 1:1.11
 %{?with_gdbmexport:BuildRequires:      gdbm18-devel >= 1.8.3}
-BuildRequires: gettext-tools
+BuildRequires: gettext-tools >= 0.18
 BuildRequires: libtool
+BuildRequires: readline-devel
 BuildRequires: texinfo
 Obsoletes:     libgdbm2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -149,6 +153,8 @@ celu wczytania do nowego formatu GDBM.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}