update to 2.9.2

- resolves #1842624
This commit is contained in:
Nikola Forró 2020-06-02 10:05:18 +02:00
parent ac2b9872d5
commit b86d63d2be
4 changed files with 14 additions and 9 deletions

1
.gitignore vendored
View File

@ -6,3 +6,4 @@
/man-db-2.8.7.tar.xz
/man-db-2.9.0.tar.xz
/man-db-2.9.1.tar.xz
/man-db-2.9.2.tar.xz

View File

@ -1,4 +1,4 @@
From 490ef9d4ea308491f56c4c51712126127b2de004 Mon Sep 17 00:00:00 2001
From c73e7dd16b7915ac9c67a376e014ea1220095348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>
Date: Tue, 27 Aug 2019 17:53:03 +0200
Subject: [PATCH] man(1): Fix override dir handling
@ -26,10 +26,10 @@ Tested-by: Nikola Forró <nforro@redhat.com>
2 files changed, 54 insertions(+), 34 deletions(-)
diff --git a/src/man.c b/src/man.c
index 24651d1..d5dc8e3 100644
index 6d1cba7..b3d13d1 100644
--- a/src/man.c
+++ b/src/man.c
@@ -2684,6 +2684,32 @@ static bool duplicate_candidates (struct candidate *left,
@@ -2712,6 +2712,32 @@ static bool duplicate_candidates (struct candidate *left,
return ret;
}
@ -62,7 +62,7 @@ index 24651d1..d5dc8e3 100644
static int compare_candidates (const struct candidate *left,
const struct candidate *right)
{
@@ -2773,6 +2799,13 @@ static int compare_candidates (const struct candidate *left,
@@ -2801,6 +2827,13 @@ static int compare_candidates (const struct candidate *left,
if (cmp)
return cmp;
@ -77,7 +77,7 @@ index 24651d1..d5dc8e3 100644
* page in the user's preferred language than a page from a better
* section, but that attracted objections, so now we prefer to get
diff --git a/src/manp.c b/src/manp.c
index 5441339..c4a25fd 100644
index 5441339..e437183 100644
--- a/src/manp.c
+++ b/src/manp.c
@@ -903,23 +903,6 @@ static char *def_path (enum config_flag flag)
@ -202,5 +202,5 @@ index 5441339..c4a25fd 100644
list = new_string_list (GL_ARRAY_LIST, false);
--
2.21.1
2.26.2

View File

@ -3,8 +3,8 @@
Summary: Tools for searching and reading man pages
Name: man-db
Version: 2.9.1
Release: 6%{?dist}
Version: 2.9.2
Release: 1%{?dist}
# GPLv2+ .. man-db
# GPLv3+ .. gnulib
License: GPLv2+ and GPLv3+
@ -231,6 +231,10 @@ fi
%config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron
%changelog
* Tue Jun 02 2020 Nikola Forró <nforro@redhat.com> - 2.9.2-1
- update to 2.9.2
resolves #1842624
* Sun Mar 01 2020 Nikola Forró <nforro@redhat.com> - 2.9.1-6
- fix %pre scriptlet

View File

@ -1 +1 @@
SHA512 (man-db-2.9.1.tar.xz) = ae2d1e9f293795c63f5a9a1a765478a9a59cbe5fe6f759647be5057c1ae53f90baee8d5467921f3d0102300f2111a5026eeb25f78401bcb16ce45ad790634977
SHA512 (man-db-2.9.2.tar.xz) = 47b63c074cf61c15f82230cc35a0062ab6ded8c3229475c6667a47ca518346d0555616c5b07bb01515b31bd80cbdc9870cd05ffff35097d013252401c6927002