rpms/man-db
7
0
Fork 0
Code Issues Pull Requests Releases Activity

update to 2.8.7

Browse Source 
- resolves #1747042
This commit is contained in:
Nikola Forró 2019-08-30 11:45:26 +02:00
parent 2d0db51d7d
commit 9c0f8d2201
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,3 +3,4 @@
/man-db-2.8.3.tar.xz /man-db-2.8.3.tar.xz
/man-db-2.8.4.tar.xz /man-db-2.8.4.tar.xz
/man-db-2.8.6.1.tar.xz /man-db-2.8.6.1.tar.xz
/man-db-2.8.7.tar.xz

10
man-db-2.8.6.1-fix-override-dir-handling.patch → man-db-2.8.7-fix-override-dir-handling.patch
View File

@ -1,4 +1,4 @@
From 0aaea01eb448a2a66c1a00b156f19fac7d686b04 Mon Sep 17 00:00:00 2001 From 50e4ba5f8848a422cf82c5b79ab0e32c8bfa10eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com> From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>
Date: Tue, 27 Aug 2019 17:53:03 +0200 Date: Tue, 27 Aug 2019 17:53:03 +0200
Subject: [PATCH] man(1): Fix override dir handling 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(-) 2 files changed, 54 insertions(+), 34 deletions(-)
diff --git a/src/man.c b/src/man.c diff --git a/src/man.c b/src/man.c
index 78c8968..197e5fb 100644 index 207e6f6..9b3d038 100644
--- a/src/man.c --- a/src/man.c
+++ b/src/man.c +++ b/src/man.c
@@ -2685,6 +2685,32 @@ static bool duplicate_candidates (struct candidate *left, @@ -2688,6 +2688,32 @@ static bool duplicate_candidates (struct candidate *left,
return ret; return ret;
} }
@ -62,7 +62,7 @@ index 78c8968..197e5fb 100644
static int compare_candidates (const struct candidate *left, static int compare_candidates (const struct candidate *left,
const struct candidate *right) const struct candidate *right)
{ {
@@ -2774,6 +2800,13 @@ static int compare_candidates (const struct candidate *left, @@ -2777,6 +2803,13 @@ static int compare_candidates (const struct candidate *left,
if (cmp) if (cmp)
return cmp; return cmp;
@ -77,7 +77,7 @@ index 78c8968..197e5fb 100644
* page in the user's preferred language than a page from a better * page in the user's preferred language than a page from a better
* section, but that attracted objections, so now we prefer to get * section, but that attracted objections, so now we prefer to get
diff --git a/src/manp.c b/src/manp.c diff --git a/src/manp.c b/src/manp.c
index 1dfecf3..13dd72a 100644 index 588f47c..db34c15 100644
--- a/src/manp.c --- a/src/manp.c
+++ b/src/manp.c +++ b/src/manp.c
@@ -935,23 +935,6 @@ static char *def_path (enum config_flag flag) @@ -935,23 +935,6 @@ static char *def_path (enum config_flag flag)

8
man-db.spec
View File

@ -3,7 +3,7 @@
Summary: Tools for searching and reading man pages Summary: Tools for searching and reading man pages
Name: man-db Name: man-db
Version: 2.8.6.1 Version: 2.8.7
Release: 1%{?dist} Release: 1%{?dist}
# GPLv2+ .. man-db # GPLv2+ .. man-db
# GPLv3+ .. gnulib # GPLv3+ .. gnulib
@ -17,7 +17,7 @@ Source3: man-db-cache-update.service
Patch0: man-db-2.8.3-change-owner-of-man-cache.patch Patch0: man-db-2.8.3-change-owner-of-man-cache.patch
# http://lists.nongnu.org/archive/html/man-db-devel/2017-01/msg00013.html # http://lists.nongnu.org/archive/html/man-db-devel/2017-01/msg00013.html
Patch1: man-db-2.8.6.1-fix-override-dir-handling.patch Patch1: man-db-2.8.7-fix-override-dir-handling.patch
Obsoletes: man < 2.0 Obsoletes: man < 2.0
Provides: man = %{version} Provides: man = %{version}
@ -178,6 +178,10 @@ fi
%config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron
%changelog %changelog
* Fri Aug 30 2019 Nikola Forró <nforro@redhat.com> - 2.8.7-1
- update to 2.8.7
resolves #1747042
* Tue Aug 27 2019 Nikola Forró <nforro@redhat.com> - 2.8.6.1-1 * Tue Aug 27 2019 Nikola Forró <nforro@redhat.com> - 2.8.6.1-1
- update to 2.8.6.1 - update to 2.8.6.1
resolves #1742475 resolves #1742475

2
sources
View File

@ -1 +1 @@
SHA512 (man-db-2.8.6.1.tar.xz) = 0c43cdddf2e07cd4a2225e098ea4cbfb2842a9bbf08bfb073058be0d66efac3a77ca0f8725564677c8f61e671f471c76f1dbba77a7601d7a63bb81350ef51bb5 SHA512 (man-db-2.8.7.tar.xz) = 9f9d6f3b776c0b35f95c179fb668f2dc3db3d3e63a162cfda98c5d126fe147f2418e1a1503037ebe28314f57d9b6f48b7f7674d611df14424973a866a61ff2d9