From 695d669090d83c3f5c08c9bb9584c19113596e5f41383b1bc7e986a5a3f96150 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 15 May 2018 09:18:57 +0000 Subject: [PATCH] Accepting request 607318 from home:scarabeus_iv:branches:devel:libraries:c_c++ - Revert to release 1.13 to allow migration to split compat package first. Otherwise OBS can't get heads or tails on conflicts OBS-URL: https://build.opensuse.org/request/show/607318 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/gdbm?expand=0&rev=47 --- baselibs.conf | 5 ++--- gdbm-1.13.tar.gz | 3 +++ gdbm-1.13.tar.gz.sig | 7 +++++++ gdbm-1.14.1.tar.gz | 3 --- gdbm-1.14.1.tar.gz.sig | 7 ------- gdbm-no-build-date.patch | 2 +- gdbm.changes | 6 ++++++ gdbm.spec | 5 ++--- 8 files changed, 21 insertions(+), 17 deletions(-) create mode 100644 gdbm-1.13.tar.gz create mode 100644 gdbm-1.13.tar.gz.sig delete mode 100644 gdbm-1.14.1.tar.gz delete mode 100644 gdbm-1.14.1.tar.gz.sig diff --git a/baselibs.conf b/baselibs.conf index 0e71c6f..4f19c60 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,8 +1,7 @@ -libgdbm5 +libgdbm4 obsoletes "gdbm- < " libgdbm_compat4 - conflicts "libgdbm4-" conflicts "libgdbm3-" gdbm-devel - requires "libgdbm5- = " + requires "libgdbm4 = " requires "libgdbm_compat4- = " diff --git a/gdbm-1.13.tar.gz b/gdbm-1.13.tar.gz new file mode 100644 index 0000000..b310dc9 --- /dev/null +++ b/gdbm-1.13.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d252cbd7d793f7b12bcceaddda98d257c14f4d1890d851c386c37207000a253 +size 891987 diff --git a/gdbm-1.13.tar.gz.sig b/gdbm-1.13.tar.gz.sig new file mode 100644 index 0000000..1171fa9 --- /dev/null +++ b/gdbm-1.13.tar.gz.sig @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.15 (GNU/Linux) + +iEYEABECAAYFAljEKKgACgkQNgKwf1XQxzJI/gCgneIHAy4tfcEhzuNLeVE4PO+D +TxcAoKNkmTk5PwNBHSbsOI8sanQop+F/ +=R+s2 +-----END PGP SIGNATURE----- diff --git a/gdbm-1.14.1.tar.gz b/gdbm-1.14.1.tar.gz deleted file mode 100644 index 2a6591b..0000000 --- a/gdbm-1.14.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cdceff00ffe014495bed3aed71c7910aa88bf29379f795abc0f46d4ee5f8bc5f -size 894412 diff --git a/gdbm-1.14.1.tar.gz.sig b/gdbm-1.14.1.tar.gz.sig deleted file mode 100644 index 9df4a94..0000000 --- a/gdbm-1.14.1.tar.gz.sig +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.15 (GNU/Linux) - -iEYEABECAAYFAlpM/RMACgkQNgKwf1XQxzJ/VACghGZzncnAAgNRdtWl0Q6J1WR+ -i1EAn1yWMe7Y31thdTCnZumJAOs6Cl6Y -=Ixl8 ------END PGP SIGNATURE----- diff --git a/gdbm-no-build-date.patch b/gdbm-no-build-date.patch index 441080e..b172d8a 100644 --- a/gdbm-no-build-date.patch +++ b/gdbm-no-build-date.patch @@ -5,7 +5,7 @@ Index: src/version.c @@ -25,9 +25,6 @@ making the distdir. */ const char * gdbm_version = "GDBM version " PACKAGE_VERSION ". " - "03/01/2018" + "11/03/2017" -#if defined(__STDC__) && defined(__DATE__) && defined(__TIME__) - " (built " __DATE__ " " __TIME__ ")" -#endif diff --git a/gdbm.changes b/gdbm.changes index 6bee2ea..2a4836e 100644 --- a/gdbm.changes +++ b/gdbm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 14 17:55:17 UTC 2018 - tchvatal@suse.com + +- Revert to release 1.13 to allow migration to split compat package + first. Otherwise OBS can't get heads or tails on conflicts + ------------------------------------------------------------------- Mon May 14 09:13:07 UTC 2018 - tchvatal@suse.com diff --git a/gdbm.spec b/gdbm.spec index 8848a0b..6a2bf93 100644 --- a/gdbm.spec +++ b/gdbm.spec @@ -16,10 +16,10 @@ # -%define lname libgdbm5 +%define lname libgdbm4 %define lcompat libgdbm_compat4 Name: gdbm -Version: 1.14.1 +Version: 1.13 Release: 0 Summary: GNU dbm key/data database License: GPL-3.0-or-later @@ -79,7 +79,6 @@ License: GPL-3.0-or-later Group: System/Libraries Recommends: %{name}-lang = %{version} # Was provided in older sonames -Conflicts: libgdbm4 Conflicts: libgdbm3 %description -n %{lcompat}