From 037d5e1debdffd5e6c8b0cc033d688de5b585354 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Tue, 5 Jan 2021 12:30:03 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/gdbm.git#fc725dab544359b761f00cc2c41321342b243e9e --- .gitignore | 1 + gdbm.spec | 14 +++++++------- gdbm_gcc_10.patch | 17 ----------------- sources | 2 +- 4 files changed, 9 insertions(+), 25 deletions(-) delete mode 100644 gdbm_gcc_10.patch diff --git a/.gitignore b/.gitignore index e23304d..494d40c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /gdbm-1.17.tar.gz /gdbm-1.18.tar.gz /gdbm-1.18.1.tar.gz +/gdbm-1.19.tar.gz diff --git a/gdbm.spec b/gdbm.spec index 6c8c5be..d1ece94 100644 --- a/gdbm.spec +++ b/gdbm.spec @@ -2,8 +2,8 @@ Summary: A GNU set of database routines which use extensible hashing Name: gdbm -Version: 1.18.1 -Release: 5%{?dist} +Version: 1.19 +Release: 1%{?dist} Epoch: 1 License: GPLv3+ URL: http://www.gnu.org/software/gdbm/ @@ -14,9 +14,7 @@ BuildRequires: gcc BuildRequires: libtool BuildRequires: gettext BuildRequires: readline-devel - - -Patch0:gdbm_gcc_10.patch +BuildRequires: make # when -libs subpkg was introduced Obsoletes: gdbm < 1:1.14.1-4 @@ -59,8 +57,6 @@ gdbm database library. You'll also need to install the gdbm package. %prep %setup -q -%patch0 -p1 - %build %configure \ --disable-static \ @@ -116,6 +112,10 @@ make check %{_mandir}/man3/* %changelog +* Tue Jan 5 2021 Filip Januš - 1.19-1 +- Rebase to latest release 1.19 +- Remove gdbm_gcc_10.patch no more necessary + * Mon Jul 27 2020 Fedora Release Engineering - 1:1.18.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/gdbm_gcc_10.patch b/gdbm_gcc_10.patch deleted file mode 100644 index 518482c..0000000 --- a/gdbm_gcc_10.patch +++ /dev/null @@ -1,17 +0,0 @@ -Author:Filip Januš -Date: 7.2.2020 -Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1799391 -After upgrade gcc to version gcc version 10.0.1 20200130 (Red Hat 10.0.1-0.7) (GCC) is not possible to build GDBM - -diff -ur gdbm-1.18.1/src/parseopt.c gdbm-1.18.1_new/src/parseopt.c ---- gdbm-1.18.1/src/parseopt.c 2018-05-30 11:39:15.000000000 +0200 -+++ gdbm-1.18.1_new/src/parseopt.c 2020-02-07 20:36:37.226390871 +0100 -@@ -255,8 +255,6 @@ - } - - char *parseopt_program_name; --char *parseopt_program_doc; --char *parseopt_program_args; - const char *program_bug_address = "<" PACKAGE_BUGREPORT ">"; - void (*parseopt_help_hook) (FILE *stream); - diff --git a/sources b/sources index 45d5fcf..a8e3988 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gdbm-1.18.1.tar.gz) = adf9d6c5bc843ff0d7f88c2a1667d509973b2d63378d0001d7e74cc10aee6ea498a4513cc88ddf78c32ba4db5cb040b2794f4f1b3338c65d9894058850e2f5ef +SHA512 (gdbm-1.19.tar.gz) = 118c5b8cdf74898bfb7c2100302fedf80096be017bf08e80a44486563cad5d93b93567622f2e7c7aceb72f30460504bd0b4ddfccf34df994ed65166e12ecd495