Accepting request 859028 from devel:libraries:c_c++

- version update to 1.19
  * Pre-read the memory mapped regions on systems that support it.
  This speeds up operations on big databases.
  * gdbmtool: tagged initialization of structured data
  Initializers for structured data can be given in tagged form, e.g.:
     store somekey { status=2, id={a,u,x}, name="foo" }
  * Bugfixes:
  ** Preserve locking type during database reorganization
- modified patches
  % gdbm-no-build-date.patch (refreshed)
- deleted patches
  - gdbm-no-common.patch (upstreamed)

OBS-URL: https://build.opensuse.org/request/show/859028
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdbm?expand=0&rev=40

gdbm-1.18.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f745b91dc
-size 941863

gdbm-1.18.1.tar.gz.sig

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iG4EABECAC4WIQQyX2UMTCtq1YgHMno2ArB/VdDHMgUCW9QDDRAcZ3JheUBnbnUu
-b3JnLnVhAAoJEDYCsH9V0Mcy6mAAnA8dtoJ6zkcTKu7hJxIcG74KvjIVAJ94zjC9
-htwPjn3VFpXHwl5V72qunw==
-=xDhc
------END PGP SIGNATURE-----

gdbm-1.19.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:37ed12214122b972e18a0d94995039e57748191939ef74115b1d41d8811364bc
+size 967861

gdbm-1.19.tar.gz.sig

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iEYEABECAAYFAl/jO/EACgkQNgKwf1XQxzJYOwCfRCxw6MmWv8ekLB4/itNikSHP
+BeMAnjAhLHtoG+n2o3ifdMWgYkSW/+dw
+=7MA5
+-----END PGP SIGNATURE-----

gdbm-no-build-date.patch

@@ -1,11 +1,11 @@
-Index: gdbm-1.18.1/src/version.c
+Index: gdbm-1.19/src/version.c
 ===================================================================
---- gdbm-1.18.1.orig/src/version.c	2018-10-31 08:08:40.768558994 +0100
+--- gdbm-1.19.orig/src/version.c	2020-12-28 14:02:20.065391921 +0100
-+++ gdbm-1.18.1/src/version.c	2018-10-31 08:09:58.052905389 +0100
++++ gdbm-1.19/src/version.c	2020-12-28 14:03:54.389977011 +0100
 @@ -25,9 +25,6 @@
     making the distdir. */
  const char * gdbm_version = "GDBM version " PACKAGE_VERSION ". "
- "27/10/2018"
+ "23/12/2020"
 -#if defined(__STDC__) && defined(__DATE__) && defined(__TIME__)
 -		" (built " __DATE__ " " __TIME__ ")"
 -#endif

gdbm-no-common.patch

@@ -1,66 +0,0 @@
-Index: gdbm-1.18.1/src/gdbm_dump.c
-===================================================================
---- gdbm-1.18.1.orig/src/gdbm_dump.c	2018-05-30 11:39:15.000000000 +0200
-+++ gdbm-1.18.1/src/gdbm_dump.c	2020-01-20 17:48:28.838317331 +0100
-@@ -19,8 +19,6 @@
- # include "gdbmapp.h"
- # include "gdbmdefs.h"
- 
--char *parseopt_program_doc = "dump a GDBM database to a file";
--char *parseopt_program_args = "DB_FILE [FILE]";
- struct gdbm_option optab[] = {
-   { 'H', "format", "binary|ascii|0|1", N_("select dump format") },
-   { 0 }
-@@ -43,6 +41,8 @@ main (int argc, char **argv)
-   textdomain (PACKAGE);
- 
-   set_progname (argv[0]);
-+  parseopt_program_doc = "dump a GDBM database to a file";
-+  parseopt_program_args = "DB_FILE [FILE]";
- 
-   for (opt = parseopt_first (argc, argv, optab);
-        opt != EOF;
-Index: gdbm-1.18.1/src/gdbm_load.c
-===================================================================
---- gdbm-1.18.1.orig/src/gdbm_load.c	2018-05-30 11:39:15.000000000 +0200
-+++ gdbm-1.18.1/src/gdbm_load.c	2020-01-20 17:49:03.454509733 +0100
-@@ -29,8 +29,6 @@ int mode;
- uid_t owner_uid;
- gid_t owner_gid;
- 
--char *parseopt_program_doc = "load a GDBM database from a file";
--char *parseopt_program_args = "FILE [DB_FILE]";
- struct gdbm_option optab[] = {
-   { 'r', "replace", NULL, N_("replace records in the existing database") },
-   { 'm', "mode", N_("MODE"), N_("set file mode") },
-@@ -107,6 +105,8 @@ main (int argc, char **argv)
-   textdomain (PACKAGE);
- 
-   set_progname (argv[0]);
-+  parseopt_program_doc = "load a GDBM database from a file";
-+  parseopt_program_args = "FILE [DB_FILE]";
- 
-   for (opt = parseopt_first (argc, argv, optab);
-        opt != EOF;
-Index: gdbm-1.18.1/src/gdbmtool.c
-===================================================================
---- gdbm-1.18.1.orig/src/gdbmtool.c	2018-10-18 14:48:12.000000000 +0200
-+++ gdbm-1.18.1/src/gdbmtool.c	2020-01-20 17:50:08.118869170 +0100
-@@ -1535,8 +1535,6 @@ command_lookup (const char *str, struct
-   return found->tok;
- }
- 
--char *parseopt_program_doc = N_("examine and/or modify a GDBM database");
--char *parseopt_program_args = N_("DBFILE [COMMAND [ARG ...]]");
- 
- enum {
-   OPT_LEX_TRACE = 256,
-@@ -2054,6 +2052,8 @@ main (int argc, char *argv[])
-   instream_t input = NULL;
-   
-   set_progname (argv[0]);
-+  parseopt_program_doc = N_("examine and/or modify a GDBM database");
-+  parseopt_program_args = N_("DBFILE [COMMAND [ARG ...]]");
- #if GDBM_DEBUG_ENABLE
-   gdbm_debug_printer = debug_printer;
- #endif

gdbm.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Mon Dec 28 13:27:28 UTC 2020 - pgajdos@suse.com
+
+- version update to 1.19
+  * Pre-read the memory mapped regions on systems that support it.
+  This speeds up operations on big databases.
+  * gdbmtool: tagged initialization of structured data
+  Initializers for structured data can be given in tagged form, e.g.:
+     store somekey { status=2, id={a,u,x}, name="foo" }
+  * Bugfixes:
+  ** Preserve locking type during database reorganization
+- modified patches
+  % gdbm-no-build-date.patch (refreshed)
+- deleted patches
+  - gdbm-no-common.patch (upstreamed)
+
 -------------------------------------------------------------------
 Sat Feb 22 19:23:10 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
 

gdbm.spec

@@ -19,7 +19,7 @@
 %define lname	libgdbm6
 %define lcompat libgdbm_compat4
 Name:           gdbm
-Version:        1.18.1
+Version:        1.19
 Release:        0
 Summary:        GNU dbm key/data database
 License:        GPL-3.0-or-later
@@ -31,8 +31,6 @@ Source2:        baselibs.conf
 Source4:        %{name}.keyring
 # PATCH-FIX-SUSE: remove the build date from src/version.c
 Patch4:         gdbm-no-build-date.patch
-# Build with -no-common, [bsc#1160872] (mail to gray@gnu.org)
-Patch5:         gdbm-no-common.patch
 BuildRequires:  libtool
 BuildRequires:  makeinfo
 BuildRequires:  readline-devel
@@ -54,9 +52,9 @@ a database.
 
 %package -n %{lname}
 Summary:        GNU dbm key/data database
+# O/P added in 12.2
 License:        GPL-3.0-or-later
 Group:          System/Libraries
-# O/P added in 12.2
 Obsoletes:      gdbm < %{version}-%{release}
 Provides:       gdbm = %{version}-%{release}
 # For lang package
@@ -78,9 +76,9 @@ a database.
 
 %package -n %{lcompat}
 Summary:        GNU dbm key/data database compat wrapper
+# Was provided in older sonames
 License:        GPL-3.0-or-later
 Group:          System/Libraries
-# Was provided in older sonames
 Conflicts:      libgdbm3
 
 %description -n %{lcompat}
@@ -97,8 +95,10 @@ License:        GPL-3.0-or-later AND LGPL-2.1-or-later
 Group:          Development/Libraries/C and C++
 Requires:       %{lcompat} = %{version}
 Requires:       %{lname} = %{version}
+%if "%{install_info_prereq}" != ""
 Requires(pre):  %{install_info_prereq}
 Requires(preun): %{install_info_prereq}
+%endif
 
 %description devel
 This package contains all necessary include files and libraries needed
@@ -107,7 +107,6 @@ to develop applications that require these.
 %prep
 %setup -q
 %patch4 -p1
-%patch5 -p1
 
 %build