From 9c0f8d2201fc8fb88410d1b8153ebb22c693f761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Fri, 30 Aug 2019 11:45:26 +0200 Subject: [PATCH] update to 2.8.7 - resolves #1747042 --- .gitignore | 1 + ...tch => man-db-2.8.7-fix-override-dir-handling.patch | 10 +++++----- man-db.spec | 8 ++++++-- sources | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) rename man-db-2.8.6.1-fix-override-dir-handling.patch => man-db-2.8.7-fix-override-dir-handling.patch (95%) diff --git a/.gitignore b/.gitignore index 435cbd6..5d67279 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /man-db-2.8.3.tar.xz /man-db-2.8.4.tar.xz /man-db-2.8.6.1.tar.xz +/man-db-2.8.7.tar.xz diff --git a/man-db-2.8.6.1-fix-override-dir-handling.patch b/man-db-2.8.7-fix-override-dir-handling.patch similarity index 95% rename from man-db-2.8.6.1-fix-override-dir-handling.patch rename to man-db-2.8.7-fix-override-dir-handling.patch index 8f9da27..fe10e50 100644 --- a/man-db-2.8.6.1-fix-override-dir-handling.patch +++ b/man-db-2.8.7-fix-override-dir-handling.patch @@ -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?= 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ó 2 files changed, 54 insertions(+), 34 deletions(-) diff --git a/src/man.c b/src/man.c -index 78c8968..197e5fb 100644 +index 207e6f6..9b3d038 100644 --- a/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; } @@ -62,7 +62,7 @@ index 78c8968..197e5fb 100644 static int compare_candidates (const struct candidate *left, 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) return cmp; @@ -77,7 +77,7 @@ index 78c8968..197e5fb 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 1dfecf3..13dd72a 100644 +index 588f47c..db34c15 100644 --- a/src/manp.c +++ b/src/manp.c @@ -935,23 +935,6 @@ static char *def_path (enum config_flag flag) diff --git a/man-db.spec b/man-db.spec index 9f8d2f5..33645e9 100644 --- a/man-db.spec +++ b/man-db.spec @@ -3,7 +3,7 @@ Summary: Tools for searching and reading man pages Name: man-db -Version: 2.8.6.1 +Version: 2.8.7 Release: 1%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib @@ -17,7 +17,7 @@ Source3: man-db-cache-update.service 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 -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 Provides: man = %{version} @@ -178,6 +178,10 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Fri Aug 30 2019 Nikola Forró - 2.8.7-1 +- update to 2.8.7 + resolves #1747042 + * Tue Aug 27 2019 Nikola Forró - 2.8.6.1-1 - update to 2.8.6.1 resolves #1742475 diff --git a/sources b/sources index 09d35a3..a94390f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (man-db-2.8.6.1.tar.xz) = 0c43cdddf2e07cd4a2225e098ea4cbfb2842a9bbf08bfb073058be0d66efac3a77ca0f8725564677c8f61e671f471c76f1dbba77a7601d7a63bb81350ef51bb5 +SHA512 (man-db-2.8.7.tar.xz) = 9f9d6f3b776c0b35f95c179fb668f2dc3db3d3e63a162cfda98c5d126fe147f2418e1a1503037ebe28314f57d9b6f48b7f7674d611df14424973a866a61ff2d9