pool/man
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1077021 from home:dimstar:Factory

Browse Source 
- Add man-propose-online.patch: if patch was not found locally,
  propose to read it online, offering a URL where it could possibly
  be found.

If the man page exists/is installed, we show the man page, otherwise
propose an URL where it might exist online (no remote check if the
man page exists... that would be too complex imho)

OBS-URL: https://build.opensuse.org/request/show/1077021
OBS-URL: https://build.opensuse.org/package/show/Base:System/man?expand=0&rev=144
This commit is contained in:
Dr. Werner Fink 2023-04-04 09:04:01 +00:00 committed by Git OBS Bridge
parent 80e04584f1
commit 39337c9fd1
3 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
man-propose-online.patch Normal file
View File

@ -0,0 +1,34 @@
diff -ur man-db-2.10.2/src/man.c man-db-2.10.2.patch/src/man.c
--- man-db-2.10.2/src/man.c 2022-03-17 19:41:27.000000000 +0100
+++ man-db-2.10.2.patch/src/man.c 2023-04-03 17:13:05.944119389 +0200
@@ -738,11 +738,16 @@
}
#endif
- if (sec)
+ if (sec) {
fprintf (stderr, _("No manual entry for %s in section %s\n"),
name, sec);
- else
+ fprintf (stderr, _("Possibly, man the page is not installed, try online at: "));
+ fprintf (stderr, _("https://manpages.opensuse.org/%s.%s\n"), name, sec);
+ } else {
fprintf (stderr, _("No manual entry for %s\n"), name);
+ fprintf (stderr, _("Possibly, man page is not installed, try online at: "));
+ fprintf (stderr, _("https://manpages.opensuse.org/%s\n"), name);
+ }
#ifdef UNDOC_COMMAND
if (getenv ("MAN_TEST_DISABLE_UNDOCUMENTED") == NULL &&
diff -ur man-db-2.10.2/src/tests/man-invalid-db-entry man-db-2.10.2.patch/src/tests/man-invalid-db-entry
--- man-db-2.10.2/src/tests/man-invalid-db-entry 2022-03-17 19:41:27.000000000 +0100
+++ man-db-2.10.2.patch/src/tests/man-invalid-db-entry 2023-04-03 17:13:55.256508193 +0200
@@ -25,6 +25,8 @@
rm -f "$tmpdir/usr/share/man/man1/test.1"
echo "No manual entry for test" > "$tmpdir/1.exp"
+echo "Possibly, man page is not installed, try online at: https://manpages.opensuse.org/test" >> "$tmpdir/1.exp"
+
LC_ALL=C run $MAN -C "$tmpdir/manpath.config" test 2> "$tmpdir/1.out"
expect_files_equal 'invalid DB entry' "$tmpdir/1.exp" "$tmpdir/1.out"

7
man.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Apr 3 14:39:03 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
- Add man-propose-online.patch: if patch was not found locally,
propose to read it online, offering a URL where it could possibly
be found.
-------------------------------------------------------------------
Tue Aug 23 06:13:49 UTC 2022 - Dr. Werner Fink <werner@suse.de>

5
man.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package man
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -58,6 +58,8 @@ Patch8: man-db-2.9.4.patch
Patch9: man-db-2.6.3-man0.dif
Patch10: man-db-2.9.4-alternitive.dif
Patch11: harden_man-db.service.patch
# PATCH-FEATURE-OPENSUSE -- Propose to read man pages online
Patch12: man-propose-online.patch
BuildRequires: automake
BuildRequires: flex
BuildRequires: gdbm-devel
@ -108,6 +110,7 @@ printer (using groff).
%patch10 -b .libalernative
rm -f configure
%patch11 -p1 -b .p11
%patch12 -p1 -b .p12
%build
%global optflags %{optflags} -funroll-loops -pipe -Wall