Compare commits
1 commit
| Author | SHA1 | Date | |
|---|---|---|---|
| ae38164c83 |
9 changed files with 264 additions and 392 deletions
17
.gitignore
vendored
17
.gitignore
vendored
|
|
@ -7,20 +7,3 @@
|
|||
/man-db-2.9.0.tar.xz
|
||||
/man-db-2.9.1.tar.xz
|
||||
/man-db-2.9.2.tar.xz
|
||||
/man-db-2.9.3.tar.xz
|
||||
/man-db-2.9.4.tar.xz
|
||||
/man-db-2.10.0.tar.xz
|
||||
/man-db-2.10.1.tar.xz
|
||||
/man-db-2.10.2.tar.xz
|
||||
/man-db-2.11.0.tar.xz
|
||||
/man-db-2.11.1.tar.xz
|
||||
/man-db-2.11.2.tar.xz
|
||||
/man-db-2.12.0.tar.xz
|
||||
/man-db-2.12.0.tar.xz.asc
|
||||
/0xac0a4ff12611b6fccf01c111393587d97d86500b
|
||||
/man-db-2.12.1.tar.xz
|
||||
/man-db-2.12.1.tar.xz.asc
|
||||
/man-db-2.13.0.tar.xz
|
||||
/man-db-2.13.0.tar.xz.asc
|
||||
/man-db-2.13.1.tar.xz
|
||||
/man-db-2.13.1.tar.xz.asc
|
||||
|
|
|
|||
30
.packit.yaml
30
.packit.yaml
|
|
@ -1,30 +0,0 @@
|
|||
specfile_path: man-db.spec
|
||||
|
||||
upstream_package_name: man-db
|
||||
downstream_package_name: man-db
|
||||
|
||||
upstream_project_url: https://gitlab.com/man-db/man-db
|
||||
|
||||
jobs:
|
||||
- job: pull_from_upstream
|
||||
trigger: release
|
||||
dist_git_branches:
|
||||
- fedora-rawhide
|
||||
|
||||
- job: koji_build
|
||||
trigger: commit
|
||||
allowed_pr_authors:
|
||||
- packit
|
||||
- all_admins
|
||||
allowed_committers:
|
||||
- all_admins
|
||||
dist_git_branches:
|
||||
- fedora-all
|
||||
|
||||
- job: bodhi_update
|
||||
trigger: commit
|
||||
allowed_builders:
|
||||
- packit
|
||||
- all_admins
|
||||
dist_git_branches:
|
||||
- fedora-branched # rawhide updates are created automatically
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
This repository is maintained by packit.
|
||||
https://packit.dev/
|
||||
The file was generated using packit 0.100.3.post1.dev9+g7a8deb2b.
|
||||
|
|
@ -1,209 +0,0 @@
|
|||
From bbf7701c4f8269090a12791f3c9bde80d45c8765 Mon Sep 17 00:00:00 2001
|
||||
From: "G. Branden Robinson" <g.branden.robinson@gmail.com>
|
||||
Date: Wed, 19 Jul 2023 01:58:07 -0500
|
||||
Subject: [PATCH 17/30] Improve lexgrog(1) portability
|
||||
|
||||
This fixes a test failure in man1/lexgrog.1 when building against groff
|
||||
1.23.0.
|
||||
|
||||
Borrow code from groff 1.23.0's "an-ext.tmac" file (licensed as
|
||||
permissively as a decadent society) to implement `EX` and `EE` extension
|
||||
macros from Ninth Edition Research Unix (1986) (and groff) to get
|
||||
monospaced code displays in a more portable way. There is no way to
|
||||
portably change font families in pure man(7) itself, and the names of
|
||||
troff typefaces aren't very portable either. There is also no portable
|
||||
way to test for the _existence_ of a font. FTW.
|
||||
|
||||
("Portable" here largely means "to AT&T device-independent troff
|
||||
implementations", for which there has been no official source since the
|
||||
mid-1990s.[1] Several AT&T Unix System V licensees/descendants have
|
||||
continued to ship their own vendored versions, but these have enjoyed
|
||||
little or no development for the past 3 decades.)
|
||||
|
||||
* Define a string `mC` to store the name of a presumed monospaced roman
|
||||
typeface. Use "CW", which is portable to AT&T device-independent
|
||||
troff of the early 1980s before it occurred to anyone that Courier
|
||||
might someday be available in italic and bold styles (and budget
|
||||
available to purchase them).
|
||||
* Define `mC` as "CR" if using a typesetting device and the formatter is
|
||||
groff, or claims groff compatibility by the setting the `.g` register.
|
||||
This is reasonably portable to modern implementations given
|
||||
traditional troff font naming practices and the pervasive influence of
|
||||
Adobe Software and the "base fonts" of its PostScript and PDF
|
||||
specifications.
|
||||
* If not typesetting (i.e., if using nroff), define `mC` as "R", which
|
||||
is certain to be available.
|
||||
* Define `EX` and `EE` macros as groff does, if the formatter does not
|
||||
set the `.g` register.
|
||||
* Migrate from `ft CW` and `nf` requests to `EX` macro calls.
|
||||
* Migrate from `ft P` and `fi` requests to `EE` macro calls.
|
||||
* Replace an inline use of `\f(CW` with a change to inline bold. There
|
||||
is to date no portable way to inline a font family change.
|
||||
|
||||
Test passes now. Tested as-is and with the `EX` and `EE` macro
|
||||
definitions forcibly enabled.
|
||||
|
||||
[1] https://groups.google.com/g/comp.text/c/COkqrii4W0E/m/7HarA8Ha2dAJ
|
||||
---
|
||||
man/man1/lexgrog.man1 | 57 ++++++++++++++++++++++++++++++++-----------
|
||||
1 file changed, 43 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/man/man1/lexgrog.man1 b/man/man1/lexgrog.man1
|
||||
index 37b9d287..f9f708f8 100644
|
||||
--- a/man/man1/lexgrog.man1
|
||||
+++ b/man/man1/lexgrog.man1
|
||||
@@ -5,6 +5,41 @@
|
||||
.\" You may distribute under the terms of the GNU General Public
|
||||
.\" License as specified in the file docs/COPYING.GPLv2 that comes with the
|
||||
.\" man-db distribution.
|
||||
+.\"
|
||||
+.ds mC CW
|
||||
+.if t .if \n(.g .ds mC CR
|
||||
+.if n .ds mC R
|
||||
+.
|
||||
+.nr mE 0 \" in an example (EX/EE)?
|
||||
+.
|
||||
+.if \n(.g \{\
|
||||
+.de EX
|
||||
+. br
|
||||
+. if !\\n(mE \{\
|
||||
+. nr mF \\n(.f
|
||||
+. nr mP \\n(PD
|
||||
+. nr PD 1v
|
||||
+. nf
|
||||
+. ft \\*(mC
|
||||
+. nr mE 1
|
||||
+. \}
|
||||
+..
|
||||
+.\}
|
||||
+.
|
||||
+.
|
||||
+.\" End example.
|
||||
+.if \n(.g \{\
|
||||
+.de EE
|
||||
+. br
|
||||
+. if \\n(mE \{\
|
||||
+. ft \\n(mF
|
||||
+. nr PD \\n(mP
|
||||
+. fi
|
||||
+. nr mE 0
|
||||
+. \}
|
||||
+..
|
||||
+.\}
|
||||
+.
|
||||
.pc
|
||||
.TH LEXGROG 1 "%date%" "%version%" "Manual pager utils"
|
||||
.SH NAME
|
||||
@@ -133,12 +168,10 @@ macro set, a correct
|
||||
section looks something like this:
|
||||
.PP
|
||||
.RS
|
||||
-.ft CW
|
||||
-.nf
|
||||
+.EX
|
||||
\&.SH NAME
|
||||
foo \e\- program to do something
|
||||
-.fi
|
||||
-.ft P
|
||||
+.EE
|
||||
.RE
|
||||
.PP
|
||||
Some manual pagers require the \(oq\e\-\(cq to be exactly as shown;
|
||||
@@ -157,18 +190,16 @@ If several features with different descriptions are being documented in the
|
||||
same manual page, the following form is therefore used:
|
||||
.PP
|
||||
.RS
|
||||
-.ft CW
|
||||
-.nf
|
||||
+.EX
|
||||
\&.SH NAME
|
||||
foo, bar \e\- programs to do something
|
||||
\&.br
|
||||
baz \e\- program to do nothing
|
||||
-.fi
|
||||
-.ft P
|
||||
+.EE
|
||||
.RE
|
||||
.PP
|
||||
-(A macro which starts a new paragraph, like \f(CW.PP\fP, may be used instead
|
||||
-of the break macro \f(CW.br\fP.)
|
||||
+(A macro which starts a new paragraph, like \fB.PP\fP, may be used instead
|
||||
+of the break macro \fB.br\fP.)
|
||||
.PP
|
||||
When using the BSD-derived
|
||||
.I mdoc
|
||||
@@ -177,13 +208,11 @@ macro set, a correct
|
||||
section looks something like this:
|
||||
.PP
|
||||
.RS
|
||||
-.ft CW
|
||||
-.nf
|
||||
+.EX
|
||||
\&.Sh NAME
|
||||
\&.Nm foo
|
||||
\&.Nd program to do something
|
||||
-.fi
|
||||
-.ft P
|
||||
+.EE
|
||||
.RE
|
||||
|
||||
There are several common reasons why whatis parsing fails.
|
||||
--
|
||||
2.41.0
|
||||
|
||||
From 043c3cb83ce179e4c49528742df24b3b53923c4d Mon Sep 17 00:00:00 2001
|
||||
From: Colin Watson <cjwatson@debian.org>
|
||||
Date: Wed, 19 Jul 2023 23:14:20 +0100
|
||||
Subject: [PATCH 18/30] Avoid translation fallout from lexgrog(1) fix
|
||||
|
||||
* man/man1/lexgrog.man1: Protect `.ds mC CW` with `.if !'po4a'hide'`, to
|
||||
avoid "CW" showing up as a string for translation.
|
||||
---
|
||||
man/man1/lexgrog.man1 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/man/man1/lexgrog.man1 b/man/man1/lexgrog.man1
|
||||
index f9f708f8..5a5f4206 100644
|
||||
--- a/man/man1/lexgrog.man1
|
||||
+++ b/man/man1/lexgrog.man1
|
||||
@@ -6,7 +6,7 @@
|
||||
.\" License as specified in the file docs/COPYING.GPLv2 that comes with the
|
||||
.\" man-db distribution.
|
||||
.\"
|
||||
-.ds mC CW
|
||||
+.if !'po4a'hide' .ds mC CW
|
||||
.if t .if \n(.g .ds mC CR
|
||||
.if n .ds mC R
|
||||
.
|
||||
--
|
||||
2.41.0
|
||||
|
||||
From b12ffb9df7a6a8956b08206c36be70fac78508bd Mon Sep 17 00:00:00 2001
|
||||
From: Colin Watson <cjwatson@debian.org>
|
||||
Date: Thu, 20 Jul 2023 00:18:59 +0100
|
||||
Subject: [PATCH 19/30] Update warning regex for groff 1.23.0
|
||||
|
||||
Part of https://gitlab.com/man-db/man-db/-/issues/25.
|
||||
|
||||
* man/check-man: groff 1.23.0 says "cannot break line" rather than
|
||||
"can't break line"; update regular expression.
|
||||
---
|
||||
man/check-man | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/man/check-man b/man/check-man
|
||||
index a58b7f9d..f8985a0d 100755
|
||||
--- a/man/check-man
|
||||
+++ b/man/check-man
|
||||
@@ -31,7 +31,7 @@ errors="$(LC_ALL=C MANWIDTH=80 MAN_KEEP_FORMATTING=1 "$top_builddir/libtool" \
|
||||
# Indeed, even for other languages we're going to get "cannot adjust line"
|
||||
# if %manpath_config_file% expands to something long. Hmm. We'll just ignore
|
||||
# this across the board for now.
|
||||
-errors="$(echo "$errors" | $EGREP -v "(cannot adjust line|can't break line)")" || true
|
||||
+errors="$(echo "$errors" | $EGREP -v "(cannot adjust line|(can't|cannot) break line)")" || true
|
||||
|
||||
if [ "$code" != 0 ]; then
|
||||
echo "man -E UTF-8 -l $1 failed with exit status $code and error output:"
|
||||
--
|
||||
2.41.0
|
||||
|
||||
19
man-db-2.8.3-change-owner-of-man-cache.patch
Normal file
19
man-db-2.8.3-change-owner-of-man-cache.patch
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
From 99dd120b952a2a27fa31ae005149e6aaaed28755 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>
|
||||
Date: Fri, 6 Apr 2018 11:52:33 +0200
|
||||
Subject: [PATCH] Set owner of man cache to root
|
||||
|
||||
---
|
||||
init/systemd/man-db.conf.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/init/systemd/man-db.conf.in b/init/systemd/man-db.conf.in
|
||||
index 7a461e8..cac2b52 100644
|
||||
--- a/init/systemd/man-db.conf.in
|
||||
+++ b/init/systemd/man-db.conf.in
|
||||
@@ -1 +1 @@
|
||||
-d /var/cache/man 0755 @cache_top_owner@ @cache_top_owner@ 1w
|
||||
+d /var/cache/man 0755 root root 1w
|
||||
--
|
||||
2.13.6
|
||||
|
||||
206
man-db-2.8.7-fix-override-dir-handling.patch
Normal file
206
man-db-2.8.7-fix-override-dir-handling.patch
Normal file
|
|
@ -0,0 +1,206 @@
|
|||
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
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Previously, override dir was affecting only some cases
|
||||
of manpath determination.
|
||||
|
||||
Apply it only when all paths has been gathered instead.
|
||||
(Depending on the definition of when the override dir applies,
|
||||
this might not be correct).
|
||||
|
||||
Also look for override dir when sorting candidates.
|
||||
|
||||
Fixes src/tests/man-9 failing when --with-override-dir=od
|
||||
is passed to ./configure.
|
||||
|
||||
Reported-by: Nikola Forró <nforro@redhat.com>
|
||||
Tested-by: Nikola Forró <nforro@redhat.com>
|
||||
---
|
||||
src/man.c | 33 ++++++++++++++++++++++++++++++++
|
||||
src/manp.c | 55 +++++++++++++++++++++---------------------------------
|
||||
2 files changed, 54 insertions(+), 34 deletions(-)
|
||||
|
||||
diff --git a/src/man.c b/src/man.c
|
||||
index 6d1cba7..b3d13d1 100644
|
||||
--- a/src/man.c
|
||||
+++ b/src/man.c
|
||||
@@ -2712,6 +2712,32 @@ static bool duplicate_candidates (struct candidate *left,
|
||||
return ret;
|
||||
}
|
||||
|
||||
+static int cand1_differs_by_override_dir (const struct candidate *left,
|
||||
+ const struct candidate *right)
|
||||
+{
|
||||
+ size_t ov_len, pre_ov_len;
|
||||
+
|
||||
+ ov_len = strlen (OVERRIDE_DIR);
|
||||
+ if (!ov_len)
|
||||
+ return 0;
|
||||
+
|
||||
+ if (!STREQ (left->source->name, right->source->name))
|
||||
+ return 0;
|
||||
+
|
||||
+ pre_ov_len = strlen(right->path);
|
||||
+ if (!STRNEQ (left->path, right->path, pre_ov_len))
|
||||
+ return 0;
|
||||
+
|
||||
+ if (left->path[pre_ov_len] != '/')
|
||||
+ return 0;
|
||||
+ pre_ov_len++;
|
||||
+
|
||||
+ if (STREQ (left->path + pre_ov_len, OVERRIDE_DIR))
|
||||
+ return 1;
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
static int compare_candidates (const struct candidate *left,
|
||||
const struct candidate *right)
|
||||
{
|
||||
@@ -2801,6 +2827,13 @@ static int compare_candidates (const struct candidate *left,
|
||||
if (cmp)
|
||||
return cmp;
|
||||
|
||||
+ /* Sort override dir first
|
||||
+ */
|
||||
+ if (cand1_differs_by_override_dir(left, right))
|
||||
+ return -1;
|
||||
+ if (cand1_differs_by_override_dir(right, left))
|
||||
+ return 1;
|
||||
+
|
||||
/* Try comparing based on language. We used to prefer to display a
|
||||
* 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..e437183 100644
|
||||
--- a/src/manp.c
|
||||
+++ b/src/manp.c
|
||||
@@ -903,23 +903,6 @@ static char *def_path (enum config_flag flag)
|
||||
return manpath;
|
||||
}
|
||||
|
||||
-/*
|
||||
- * If specified with configure, append OVERRIDE_DIR to dir param and add it
|
||||
- * to list.
|
||||
- */
|
||||
-static void insert_override_dir (gl_list_t list, const char *dir)
|
||||
-{
|
||||
- char *override_dir = NULL;
|
||||
-
|
||||
- if (!strlen (OVERRIDE_DIR))
|
||||
- return;
|
||||
-
|
||||
- if ((override_dir = xasprintf ("%s/%s", dir, OVERRIDE_DIR))) {
|
||||
- add_dir_to_list (list, override_dir);
|
||||
- free (override_dir);
|
||||
- }
|
||||
-}
|
||||
-
|
||||
/*
|
||||
* For each directory in the user's path, see if it is one of the
|
||||
* directories listed in the man_db.config file. If so, and it is
|
||||
@@ -968,7 +951,6 @@ char *get_manpath_from_path (const char *path, int mandatory)
|
||||
if (!manpath_map_found)
|
||||
debug ("is in the config file\n");
|
||||
manpath_map_found = true;
|
||||
- insert_override_dir (tmplist, config_item->cont);
|
||||
add_dir_to_list (tmplist, config_item->cont);
|
||||
} GL_LIST_FOREACH_END (config);
|
||||
|
||||
@@ -989,11 +971,8 @@ char *get_manpath_from_path (const char *path, int mandatory)
|
||||
debug ("adding mandatory man directories\n");
|
||||
|
||||
GL_LIST_FOREACH_START (config, config_item) {
|
||||
- if (config_item->flag == MANDATORY) {
|
||||
- insert_override_dir (tmplist,
|
||||
- config_item->key);
|
||||
+ if (config_item->flag == MANDATORY)
|
||||
add_dir_to_list (tmplist, config_item->key);
|
||||
- }
|
||||
} GL_LIST_FOREACH_END (config);
|
||||
}
|
||||
|
||||
@@ -1078,7 +1057,6 @@ static void add_man_subdirs (gl_list_t list, const char *path)
|
||||
if (subdir) {
|
||||
newpath = xasprintf ("%.*s/man", (int) (subdir - path), path);
|
||||
if (is_directory (newpath) == 1) {
|
||||
- insert_override_dir (list, newpath);
|
||||
add_dir_to_list (list, newpath);
|
||||
}
|
||||
free (newpath);
|
||||
@@ -1086,7 +1064,6 @@ static void add_man_subdirs (gl_list_t list, const char *path)
|
||||
|
||||
newpath = xasprintf ("%s/man", path);
|
||||
if (is_directory (newpath) == 1) {
|
||||
- insert_override_dir (list, newpath);
|
||||
add_dir_to_list (list, newpath);
|
||||
}
|
||||
free (newpath);
|
||||
@@ -1095,7 +1072,6 @@ static void add_man_subdirs (gl_list_t list, const char *path)
|
||||
newpath = xasprintf ("%.*s/share/man",
|
||||
(int) (subdir - path), path);
|
||||
if (is_directory (newpath) == 1) {
|
||||
- insert_override_dir (list, newpath);
|
||||
add_dir_to_list (list, newpath);
|
||||
}
|
||||
free (newpath);
|
||||
@@ -1103,7 +1079,6 @@ static void add_man_subdirs (gl_list_t list, const char *path)
|
||||
|
||||
newpath = xasprintf ("%s/share/man", path);
|
||||
if (is_directory (newpath) == 1) {
|
||||
- insert_override_dir (list, newpath);
|
||||
add_dir_to_list (list, newpath);
|
||||
}
|
||||
free (newpath);
|
||||
@@ -1199,7 +1174,9 @@ gl_list_t create_pathlist (const char *manp)
|
||||
const struct canonicalized_path *cp;
|
||||
|
||||
/* Expand the manpath into a list of (path, canonicalized path)
|
||||
- * pairs for easier handling. add_dir_to_path_list only adds items
|
||||
+ * pairs for easier handling. For each entry, add corresponding
|
||||
+ * OVERRIDE_DIR.
|
||||
+ * add_dir_to_path_list only adds items
|
||||
* if they do not have the same canonicalized path as an existing
|
||||
* item, thereby eliminating duplicates due to symlinks.
|
||||
*/
|
||||
@@ -1208,15 +1185,25 @@ gl_list_t create_pathlist (const char *manp)
|
||||
(GL_LINKEDHASH_LIST, canonicalized_path_equals,
|
||||
canonicalized_path_hash, canonicalized_path_free, false);
|
||||
for (p = manp;; p = end + 1) {
|
||||
+ char *element, *element_override;
|
||||
+ ssize_t p_len;
|
||||
+
|
||||
end = strchr (p, ':');
|
||||
- if (end) {
|
||||
- char *element = xstrndup (p, end - p);
|
||||
- add_dir_to_path_list (canonicalized_list, element);
|
||||
- free (element);
|
||||
- } else {
|
||||
- add_dir_to_path_list (canonicalized_list, p);
|
||||
- break;
|
||||
+ p_len = end ? end - p : (ssize_t)strlen(p);
|
||||
+
|
||||
+ element = xstrndup (p, p_len);
|
||||
+
|
||||
+ if (strlen(OVERRIDE_DIR)) {
|
||||
+ element_override = xasprintf("%s/%s", element, OVERRIDE_DIR);
|
||||
+ add_dir_to_path_list (canonicalized_list, element_override);
|
||||
+ free (element_override);
|
||||
}
|
||||
+
|
||||
+ add_dir_to_path_list (canonicalized_list, element);
|
||||
+ free (element);
|
||||
+
|
||||
+ if (!end)
|
||||
+ break;
|
||||
}
|
||||
|
||||
list = new_string_list (GL_ARRAY_LIST, false);
|
||||
--
|
||||
2.26.2
|
||||
|
||||
13
man-db-2.9.1-snap.patch
Normal file
13
man-db-2.9.1-snap.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/src/man_db.conf.in b/src/man_db.conf.in
|
||||
index 2942000..6365ca0 100644
|
||||
--- a/src/man_db.conf.in
|
||||
+++ b/src/man_db.conf.in
|
||||
@@ -69,7 +69,7 @@ MANDB_MAP /usr/local/man /var/cache/man/oldlocal
|
||||
MANDB_MAP /usr/local/share/man /var/cache/man/local
|
||||
MANDB_MAP /usr/X11R6/man /var/cache/man/X11R6
|
||||
MANDB_MAP /opt/man /var/cache/man/opt
|
||||
-MANDB_MAP /snap/man /var/cache/man/snap
|
||||
+MANDB_MAP /var/lib/snapd/snap/man /var/cache/man/snap
|
||||
#
|
||||
#---------------------------------------------------------
|
||||
# Program definitions. These are commented out by default as the value
|
||||
155
man-db.spec
155
man-db.spec
|
|
@ -1,39 +1,43 @@
|
|||
%global cache /var/cache/man
|
||||
%global gnulib_ver 20140202
|
||||
|
||||
# workaround for bug #1871971
|
||||
%global _lto_cflags %{nil}
|
||||
|
||||
Summary: Tools for searching and reading man pages
|
||||
Name: man-db
|
||||
Version: 2.13.1
|
||||
Release: 2%{?dist}
|
||||
Version: 2.9.2
|
||||
Release: 6%{?dist}
|
||||
# GPLv2+ .. man-db
|
||||
# GPLv3+ .. gnulib
|
||||
License: GPL-2.0-or-later AND GPL-3.0-or-later
|
||||
License: GPLv2+ and GPLv3+
|
||||
URL: http://www.nongnu.org/man-db/
|
||||
|
||||
Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.xz
|
||||
Source1: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.xz.asc
|
||||
# Man-db GPG key is stored in a different name which makes it hard to fetch
|
||||
# It was downloaded here: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xac0a4ff12611b6fccf01c111393587d97d86500b
|
||||
Source2: 0xac0a4ff12611b6fccf01c111393587d97d86500b
|
||||
Source1: man-db.crondaily
|
||||
Source2: man-db.sysconfig
|
||||
Source3: man-db-cache-update.service
|
||||
Source4: man-db-restart-cache-update.service
|
||||
Patch0: man-db-2.8.3-change-owner-of-man-cache.patch
|
||||
|
||||
Source3: man-db.crondaily
|
||||
Source4: man-db.sysconfig
|
||||
Source5: man-db-cache-update.service
|
||||
Source6: man-db-restart-cache-update.service
|
||||
# http://lists.nongnu.org/archive/html/man-db-devel/2017-01/msg00013.html
|
||||
Patch1: man-db-2.8.7-fix-override-dir-handling.patch
|
||||
|
||||
# change snap system directory from /snap to /var/lib/snapd/snap
|
||||
# https://lists.gnu.org/archive/html/man-db-devel/2020-02/msg00000.html
|
||||
Patch2: man-db-2.9.1-snap.patch
|
||||
|
||||
Obsoletes: man < 2.0
|
||||
Provides: man = %{version}
|
||||
Provides: man-pages-reader = %{version}
|
||||
# FPC exception for gnulib - copylib - https://fedorahosted.org/fpc/ticket/174
|
||||
Provides: bundled(gnulib)
|
||||
Provides: bundled(gnulib) = %{gnulib_ver}
|
||||
|
||||
Requires: coreutils, grep, groff-base, gzip, less
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc
|
||||
BuildRequires: systemd
|
||||
BuildRequires: gdbm-devel, gettext, groff, less, libpipeline-devel, zlib-devel
|
||||
BuildRequires: po4a, perl-interpreter, perl-version
|
||||
BuildRequires: gnupg2
|
||||
Recommends: glibc-gconv-extra
|
||||
|
||||
Requires(post): %{_sbindir}/update-alternatives
|
||||
Requires(postun): %{_sbindir}/update-alternatives
|
||||
|
|
@ -59,7 +63,6 @@ BuildArch: noarch
|
|||
This package provides periodic update of man-db cache.
|
||||
|
||||
%prep
|
||||
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
|
|
@ -68,7 +71,6 @@ This package provides periodic update of man-db cache.
|
|||
--disable-setuid --disable-cache-owner \
|
||||
--with-systemdsystemunitdir=no \
|
||||
--with-browser=elinks --with-lzip=lzip \
|
||||
--with-snapdir=/var/lib/snapd/snap \
|
||||
--with-override-dir=overrides
|
||||
%make_build CC="%{__cc} %{optflags}"
|
||||
|
||||
|
|
@ -100,18 +102,18 @@ install -d -m 0755 $RPM_BUILD_ROOT%{cache}
|
|||
|
||||
# install cron script for man-db creation/update
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily
|
||||
install -D -p -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/man-db.cron
|
||||
install -D -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/man-db.cron
|
||||
|
||||
# config for cron script
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
|
||||
install -D -p -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/man-db
|
||||
install -D -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/man-db
|
||||
|
||||
# config for tmpfiles.d
|
||||
install -D -p -m 0644 init/systemd/man-db.conf $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/.
|
||||
|
||||
# man-db-cache-update.service and man-db-restart-cache-update.service
|
||||
install -D -p -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_unitdir}/man-db-cache-update.service
|
||||
install -D -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/man-db-restart-cache-update.service
|
||||
install -D -p -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_unitdir}/man-db-cache-update.service
|
||||
install -D -p -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/man-db-restart-cache-update.service
|
||||
|
||||
%find_lang %{name}
|
||||
%find_lang %{name}-gnulib
|
||||
|
|
@ -170,8 +172,8 @@ fi
|
|||
|
||||
%files -f %{name}.lang -f %{name}-gnulib.lang
|
||||
%{!?_licensedir:%global license %%doc}
|
||||
%license COPYING
|
||||
%doc README.md man-db-manual.txt man-db-manual.ps ChangeLog NEWS.md
|
||||
%license docs/COPYING
|
||||
%doc README man-db-manual.txt man-db-manual.ps ChangeLog NEWS
|
||||
%config(noreplace) %{_sysconfdir}/man_db.conf
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/man-db
|
||||
%config(noreplace) %{_tmpfilesdir}/man-db.conf
|
||||
|
|
@ -218,127 +220,20 @@ fi
|
|||
%lang(id) %{_datadir}/man/id/man*/*
|
||||
%lang(it) %{_datadir}/man/it/man*/*
|
||||
%lang(ja) %{_datadir}/man/ja/man*/*
|
||||
%lang(ko) %{_datadir}/man/ko/man*/*
|
||||
%lang(nl) %{_datadir}/man/nl/man*/*
|
||||
%lang(pl) %{_datadir}/man/pl/man*/*
|
||||
%lang(pt) %{_datadir}/man/pt/man*/*
|
||||
%lang(pt_BR) %{_datadir}/man/pt_BR/man*/*
|
||||
%lang(ro) %{_datadir}/man/ro/man*/*
|
||||
%lang(ru) %{_datadir}/man/ru/man*/*
|
||||
%lang(sr) %{_datadir}/man/sr/man*/*
|
||||
%lang(sv) %{_datadir}/man/sv/man*/*
|
||||
%lang(tr) %{_datadir}/man/tr/man*/*
|
||||
%lang(zh_CN) %{_datadir}/man/zh_CN/man*/*
|
||||
%lang(uk) %{_datadir}/man/uk/man*/*
|
||||
|
||||
%files cron
|
||||
%config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron
|
||||
|
||||
%changelog
|
||||
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Mon May 05 2025 Lukas Javorsky <ljavorsk@redhat.com> - 2.13.1-1
|
||||
- Rebase to version 2.13.1
|
||||
|
||||
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Thu Aug 29 2024 Packit <hello@packit.dev> - 2.13.0-1
|
||||
- Update to version 2.13.0
|
||||
- Resolves: rhbz#2308476
|
||||
|
||||
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Mon Apr 08 2024 Lukas Javorsky <ljavorsk@redhat.com> - 2.12.1-1
|
||||
- Rebase to version 2.12.1
|
||||
|
||||
* Mon Jan 29 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.0-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Tue Oct 10 2023 Lukas Javorsky <ljavorsk@redhat.com> - 2.12.0-3
|
||||
- Fix the Source numbering in installation
|
||||
- Resolves: BZ#2242757
|
||||
|
||||
* Fri Sep 29 2023 Lukas Javorsky <ljavorsk@redhat.com> - 2.12.0-2
|
||||
- Add GPG verify on the package
|
||||
|
||||
* Wed Sep 27 2023 Lukas Javorsky <ljavorsk@redhat.com> - 2.12.0-1
|
||||
- Rebase to version 2.12.0
|
||||
- Patch0 was upstreamed
|
||||
|
||||
* Tue Jul 25 2023 Lukas Javorsky <ljavorsk@redhat.com> - 2.11.2-5
|
||||
- Release bump after added Patch0 from yselkowitz
|
||||
|
||||
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.2-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Mon Jul 10 2023 Lukas Javorsky <ljavorsk@redhat.com> - 2.11.2-3
|
||||
- Add Recommends to package glibc-gconv-extra
|
||||
- Justification in BZ#2182414
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Mon Jan 09 2023 Lukas Javorsky <ljavorsk@redhat.com> - 2.11.2-1
|
||||
- Rebase to version 2.11.2
|
||||
|
||||
* Fri Nov 18 2022 Lukas Javorsky <ljavorsk@redhat.com> - 2.11.1-1
|
||||
- Rebase to version 2.11.1
|
||||
- Add Korean translations
|
||||
- Resolves: #2142761
|
||||
|
||||
* Fri Oct 14 2022 Lukas Javorsky <ljavorsk@redhat.com> - 2.11.0-1
|
||||
- Rebase to version 2.11.0
|
||||
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Fri Mar 18 2022 Nikola Forró <nforro@redhat.com> - 2.10.2-1
|
||||
- update to 2.10.2
|
||||
resolves: #2065447
|
||||
|
||||
* Fri Feb 11 2022 Nikola Forró <nforro@redhat.com> - 2.10.1-1
|
||||
- update to 2.10.1
|
||||
resolves #2053020
|
||||
|
||||
* 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
|
||||
|
||||
* Sun Feb 06 2022 Nikola Forró <nforro@redhat.com> - 2.10.0-1
|
||||
- update to 2.10.0
|
||||
resolves #2050778
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.4-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.4-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Thu Feb 11 2021 Nikola Forró <nforro@redhat.com> - 2.9.4-1
|
||||
- update to 2.9.4
|
||||
resolves #1926527
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Fri Oct 09 2020 Jeff Law <law@redhat.com> - 2.9.3-2
|
||||
- Re-enable LTO
|
||||
|
||||
* Tue Oct 06 2020 Nikola Forró <nforro@redhat.com> - 2.9.3-1
|
||||
- update to 2.9.3
|
||||
resolves #1849809
|
||||
|
||||
* Thu Sep 03 2020 Nikola Forró <nforro@redhat.com> - 2.9.2-6
|
||||
- disable LTO to workaround a possible linker bug
|
||||
related to #1871971
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,3 +1 @@
|
|||
SHA512 (man-db-2.13.1.tar.xz) = 9b39f512fe940e648ca7f47803f42e473064253b67eb96995d28da30fd322de31a4466bf821e9391e6041af2318a6d2c2d74102b73f4b42a63966b41d2df0578
|
||||
SHA512 (man-db-2.13.1.tar.xz.asc) = 0d7f5b58430ce779261f68517c212b0517485300d8ea3d6a8232b0ac6c892671346ce7a4f4c6621b512516ca4c70bc09d5d828ed54a2a27c30ca70d3c77f7cdd
|
||||
SHA512 (0xac0a4ff12611b6fccf01c111393587d97d86500b) = 6509ce7ccd1b60b71e180e6ea9c6b63788d55c27f013e03609e649ef1e5b4f28b5358a7a7160e192b20c09e16ba5b24c111bd8275f8218029febe872a016448e
|
||||
SHA512 (man-db-2.9.2.tar.xz) = 47b63c074cf61c15f82230cc35a0062ab6ded8c3229475c6667a47ca518346d0555616c5b07bb01515b31bd80cbdc9870cd05ffff35097d013252401c6927002
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue