backport upstream fixes for the unstable test

man-db-2.10.0-fix-mandb-symlink-target-timestamp-test.patch

@@ -0,0 +1,33 @@
+From b86431ba72c3a21484fb221db6b6a82a78cc4bd8 Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@debian.org>
+Date: Fri, 4 Feb 2022 16:13:09 +0000
+Subject: [PATCH] Fix mandb-symlink-target-timestamp test
+
+* src/tests/mandb-symlink-target-timestamp: Fix handling of the case
+where the nanosecond part of a timestamp starts with a zero.
+
+* src/tests/mandb-symlink-target-timestamp: Fix handling of the case
+where the nanosecond part of a timestamp is exactly 0 (probably because
+the filesystem doesn't support nanosecond resolution).
+---
+ src/tests/mandb-symlink-target-timestamp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/tests/mandb-symlink-target-timestamp b/src/tests/mandb-symlink-target-timestamp
+index 1c87d3d..bc1baf1 100755
+--- a/src/tests/mandb-symlink-target-timestamp
++++ b/src/tests/mandb-symlink-target-timestamp
+@@ -21,8 +21,8 @@ write_page test 1 "$tmpdir/usr/share/man/man1/test.1.gz" \
+ ln -s test.1.gz "$tmpdir/usr/share/man/man1/test-link.1.gz"
+ run $MANDB -C "$tmpdir/manpath.config" -u -q "$tmpdir/usr/share/man"
+ cat >"$tmpdir/1.exp" <<EOF
+-test -> "- 1 1 $(./get-mtime "$tmpdir/usr/share/man/man1/test.1.gz" | tr . ' ') A - - gz test(1)"
+-test-link -> "- 1 1 $(./get-mtime "$tmpdir/usr/share/man/man1/test-link.1.gz" | tr . ' ') B - - gz test(1)"
++test -> "- 1 1 $(./get-mtime "$tmpdir/usr/share/man/man1/test.1.gz" | sed 's/\.0*\([0-9]\)/ \1/') A - - gz test(1)"
++test-link -> "- 1 1 $(./get-mtime "$tmpdir/usr/share/man/man1/test-link.1.gz" | sed 's/\.0*\([0-9]\)/ \1/') B - - gz test(1)"
+ EOF
+ run $ACCESSDB "$tmpdir/usr/share/man/index$db_ext" | \
+ 	grep -v '^\$' >"$tmpdir/1.out"
+-- 
+2.34.1
+

man-db-2.10.0-skip-mandb-symlink-target-timestamp-test.patch

@@ -1,13 +0,0 @@
-diff --git a/src/tests/mandb-symlink-target-timestamp b/src/tests/mandb-symlink-target-timestamp
-index 1c87d3d..c84449f 100755
---- a/src/tests/mandb-symlink-target-timestamp
-+++ b/src/tests/mandb-symlink-target-timestamp
-@@ -9,6 +9,8 @@
- : ${MANDB=mandb}
- : ${ACCESSDB=accessdb}
- 
-+skip "this test is unstable, skip for now: https://gitlab.com/cjwatson/man-db/-/issues/3"
-+
- init
- fake_config /usr/share/man
- MANPATH="$tmpdir/usr/share/man"

man-db.spec

@@ -4,7 +4,7 @@
 Summary: Tools for searching and reading man pages
 Name: man-db
 Version: 2.10.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 # GPLv2+ .. man-db
 # GPLv3+ .. gnulib
 License: GPLv2+ and GPLv3+
@@ -25,7 +25,7 @@ Patch1: man-db-2.10.0-fix-override-dir-handling.patch
 Patch2: man-db-2.9.1-snap.patch
 
 # https://gitlab.com/cjwatson/man-db/-/issues/3
-Patch3: man-db-2.10.0-skip-mandb-symlink-target-timestamp-test.patch
+Patch3: man-db-2.10.0-fix-mandb-symlink-target-timestamp-test.patch
 
 Obsoletes: man < 2.0
 Provides: man = %{version}
@@ -236,6 +236,9 @@ fi
 %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron
 
 %changelog
+* Tue Feb 08 2022 Nikola Forró <nforro@redhat.com> - 2.10.0-3
+- backport upstream fixes for the unstable test
+
 * Tue Feb 08 2022 Nikola Forró <nforro@redhat.com> - 2.10.0-2
 - skip unstable test