diff --git a/man-db-2.5.9-sgr.patch b/man-db-2.5.9-sgr.patch new file mode 100644 index 0000000..a41cd21 --- /dev/null +++ b/man-db-2.5.9-sgr.patch @@ -0,0 +1,24 @@ +diff -up man-db-2.5.9/include/manconfig.h.in.sgr man-db-2.5.9/include/manconfig.h.in +--- man-db-2.5.9/include/manconfig.h.in.sgr 2010-11-17 12:30:36.000000000 +0100 ++++ man-db-2.5.9/include/manconfig.h.in 2010-11-24 11:29:57.000000000 +0100 +@@ -128,7 +128,7 @@ + + #ifndef NROFF_MISSING + # ifndef NROFF +-# define NROFF "@nroff@" ++# define NROFF "@nroff@ -c" + # endif + #endif + +diff -up man-db-2.5.9/src/man_db.conf.in.sgr man-db-2.5.9/src/man_db.conf.in +--- man-db-2.5.9/src/man_db.conf.in.sgr 2009-03-15 13:17:24.000000000 +0100 ++++ man-db-2.5.9/src/man_db.conf.in 2010-11-24 11:27:45.000000000 +0100 +@@ -80,7 +80,7 @@ MANDB_MAP /opt/man /var/cache/man/opt + #DEFINE tr @tr@ '\255\267\264\327' '\055\157\047\170' + #DEFINE grep @grep@ + #DEFINE troff @troff@ +-#DEFINE nroff @nroff@ ++#DEFINE nroff @nroff@ -c + #DEFINE eqn @eqn@ + #DEFINE neqn @neqn@ + #DEFINE tbl @tbl@ diff --git a/man-db.spec b/man-db.spec index a15a454..36f2729 100644 --- a/man-db.spec +++ b/man-db.spec @@ -3,7 +3,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.5.9 -Release: 1%{?dist} +Release: 2%{?dist} # project man-db GPLv2+ # Gnulib part GPLv3+ License: GPLv2+ and GPLv3+ @@ -13,6 +13,8 @@ Source0: http://mirrors.igsobe.com/nongnu/man-db/%{name}-%{version}.tar.gz Source1: man-db.crondaily Source2: man-db.sysconfig Patch0: man-db-2.5.9-config.patch +# Resolves: #655385 - use old format of nroff output +Patch1: man-db-2.5.9-sgr.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: man < 2.0 Provides: man-pages-reader = %{version} @@ -32,6 +34,7 @@ manual pages. %prep %setup -q %patch0 -p1 -b .conf +%patch1 -p1 -b .sgr %build %configure\ @@ -113,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT %lang(ja) %{_datadir}/man/ja/man*/* %changelog +* Wed Nov 24 2010 Ivana Hutarova Varekova - 2.5.9-2 +- Resolves: #655385 - use old format of nroff output + * Mon Nov 22 2010 Ivana Hutarova Varekova - 2.5.9-1 - update to 2.5.9