diff --git a/.gitignore b/.gitignore index 292c7d2..36994c7 100644 --- a/.gitignore +++ b/.gitignore @@ -12,15 +12,3 @@ /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 diff --git a/.packit.yaml b/.packit.yaml deleted file mode 100644 index 774fcc5..0000000 --- a/.packit.yaml +++ /dev/null @@ -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 diff --git a/README.packit b/README.packit deleted file mode 100644 index 3331d79..0000000 --- a/README.packit +++ /dev/null @@ -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. diff --git a/man-db-2.11.2-groff-1.23.patch b/man-db-2.11.2-groff-1.23.patch deleted file mode 100644 index 776b721..0000000 --- a/man-db-2.11.2-groff-1.23.patch +++ /dev/null @@ -1,209 +0,0 @@ -From bbf7701c4f8269090a12791f3c9bde80d45c8765 Mon Sep 17 00:00:00 2001 -From: "G. Branden Robinson" -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 -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 -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 - diff --git a/man-db.spec b/man-db.spec index 970167c..e6e51cf 100644 --- a/man-db.spec +++ b/man-db.spec @@ -2,23 +2,18 @@ Summary: Tools for searching and reading man pages Name: man-db -Version: 2.13.1 +Version: 2.10.2 Release: 2%{?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 - -Source3: man-db.crondaily -Source4: man-db.sysconfig -Source5: man-db-cache-update.service -Source6: man-db-restart-cache-update.service +Source1: man-db.crondaily +Source2: man-db.sysconfig +Source3: man-db-cache-update.service +Source4: man-db-restart-cache-update.service Obsoletes: man < 2.0 Provides: man = %{version} @@ -32,8 +27,6 @@ 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 +52,6 @@ BuildArch: noarch This package provides periodic update of man-db cache. %prep -%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -p1 %build @@ -100,18 +92,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 @@ -218,7 +210,6 @@ 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*/* @@ -229,75 +220,11 @@ fi %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 - 2.13.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Mon May 05 2025 Lukas Javorsky - 2.13.1-1 -- Rebase to version 2.13.1 - -* Fri Jan 17 2025 Fedora Release Engineering - 2.13.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Aug 29 2024 Packit - 2.13.0-1 -- Update to version 2.13.0 -- Resolves: rhbz#2308476 - -* Thu Jul 18 2024 Fedora Release Engineering - 2.12.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Apr 08 2024 Lukas Javorsky - 2.12.1-1 -- Rebase to version 2.12.1 - -* Mon Jan 29 2024 Fedora Release Engineering - 2.12.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 2.12.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 2.12.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Tue Oct 10 2023 Lukas Javorsky - 2.12.0-3 -- Fix the Source numbering in installation -- Resolves: BZ#2242757 - -* Fri Sep 29 2023 Lukas Javorsky - 2.12.0-2 -- Add GPG verify on the package - -* Wed Sep 27 2023 Lukas Javorsky - 2.12.0-1 -- Rebase to version 2.12.0 -- Patch0 was upstreamed - -* Tue Jul 25 2023 Lukas Javorsky - 2.11.2-5 -- Release bump after added Patch0 from yselkowitz - -* Thu Jul 20 2023 Fedora Release Engineering - 2.11.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Mon Jul 10 2023 Lukas Javorsky - 2.11.2-3 -- Add Recommends to package glibc-gconv-extra -- Justification in BZ#2182414 - -* Thu Jan 19 2023 Fedora Release Engineering - 2.11.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Jan 09 2023 Lukas Javorsky - 2.11.2-1 -- Rebase to version 2.11.2 - -* Fri Nov 18 2022 Lukas Javorsky - 2.11.1-1 -- Rebase to version 2.11.1 -- Add Korean translations -- Resolves: #2142761 - -* Fri Oct 14 2022 Lukas Javorsky - 2.11.0-1 -- Rebase to version 2.11.0 - * Thu Jul 21 2022 Fedora Release Engineering - 2.10.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 3118843..0d9213b 100644 --- a/sources +++ b/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.10.2.tar.xz) = 5ad7a7b601aadf4d2d7cc068881fffe3d91dc85fcf4c17e66fbe6e2b04bb1c46f5ba5d4bc7f6ab3f39e00065be39061b101d3064c12b1e89f0fee61c088611bf