From 1fdb30ecbef75900e30d2ab79bcef19be813b4ed Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 30 2018 05:07:22 +0000 Subject: import man-db-2.6.3-11.el7 --- diff --git a/SOURCES/man-db-2.6.3-easter-egg.patch b/SOURCES/man-db-2.6.3-easter-egg.patch new file mode 100644 index 0000000..bf5e92a --- /dev/null +++ b/SOURCES/man-db-2.6.3-easter-egg.patch @@ -0,0 +1,34 @@ +From b2cf10cb8df0d6c9b66547f8b98b73f9055c7376 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Nikola=20Forr=C3=B3?= +Date: Wed, 22 Nov 2017 14:42:33 +0100 +Subject: [PATCH] Remove Easter egg entirely + +Six years is a reasonable shelf life for a joke, but I think its time +has passed now. + +* src/man.c (main): Remove Easter egg. +--- + src/man.c | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/src/man.c b/src/man.c +index 5a72e1f..20d5a5e 100644 +--- a/src/man.c ++++ b/src/man.c +@@ -1158,13 +1158,6 @@ int main (int argc, char *argv[]) + debug ("\nusing %s as pager\n", pager); + + if (first_arg == argc) { +- /* http://twitter.com/#!/marnanel/status/132280557190119424 */ +- time_t now = time (NULL); +- struct tm *localnow = localtime (&now); +- if (localnow && +- localnow->tm_hour == 0 && localnow->tm_min == 30) +- fprintf (stderr, "gimme gimme gimme\n"); +- + if (print_where) { + manp = get_manpath (""); + printf ("%s\n", manp); +-- +2.13.6 + diff --git a/SPECS/man-db.spec b/SPECS/man-db.spec index e6de0fb..099e5d2 100644 --- a/SPECS/man-db.spec +++ b/SPECS/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.6.3 -Release: 9%{?dist} +Release: 11%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -33,6 +33,8 @@ Patch6: man-db-2.6.3-gcc.patch Patch7: man-db-2.6.3-valgrind.patch # fixed certain man pages to match options with --help and --usage Patch8: man-db-2.6.3-man-options.patch +# resolves: #1515352 +Patch9: man-db-2.6.3-easter-egg.patch Obsoletes: man < 2.0 Provides: man = %{version} @@ -41,7 +43,7 @@ Provides: man-pages-reader = %{version} Provides: bundled(gnulib) = %{gnulib_ver} Requires: coreutils, grep, groff-base, gzip, less -BuildRequires: gdbm-devel, gettext, groff, less, libpipeline-devel, zlib-devel +BuildRequires: gdbm-devel, gettext, groff, less, libpipeline-devel, po4a, zlib-devel %description The man-db package includes five tools for browsing man-pages: @@ -62,6 +64,7 @@ manual pages. %patch6 -p1 -b .gcc %patch7 -p1 -b .valgrind-mem %patch8 -p1 -b .man-options +%patch9 -p1 -b .easter-egg %build %configure \ @@ -131,10 +134,25 @@ install -D -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/man-db %{_mandir}/man8/accessdb.8* %{_mandir}/man8/catman.8* %{_mandir}/man8/mandb.8* +%lang(de) %{_datadir}/man/de/man*/* %lang(es) %{_datadir}/man/es/man*/* +%lang(fr) %{_datadir}/man/fr/man*/* +%lang(id) %{_datadir}/man/id/man*/* %lang(it) %{_datadir}/man/it/man*/* +%lang(ja) %{_datadir}/man/ja/man*/* +%lang(nl) %{_datadir}/man/nl/man*/* +%lang(pl) %{_datadir}/man/pl/man*/* +%lang(ru) %{_datadir}/man/ru/man*/* %changelog +* Tue Jul 10 2018 Nikola Forró - 2.6.3-11 +- related: #1515352 + build and install all translated man pages + +* Tue Nov 21 2017 Nikola Forró - 2.6.3-10 +- resolves: #1515352 + remove easter egg interfering with non-error cases + * Mon Mar 17 2014 Peter Schiffer - 2.6.3-9 - resolves: #1067085 fixed crash when running man with -M parameter