From ee9440fef37e5e887c9302254b392a939ba38d9b107dfb1069736b68fb1bbb0b Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 4 Jan 2007 00:55:33 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/groff?expand=0&rev=2 --- groff.changes | 9 ++++++++- groff.spec | 12 ++++++++---- gxdview.changes | 7 +++++++ gxdview.spec | 10 +++++++--- utf8.patch | 28 +++++++++++++++------------- 5 files changed, 45 insertions(+), 21 deletions(-) diff --git a/groff.changes b/groff.changes index ae64b54..65db6e5 100644 --- a/groff.changes +++ b/groff.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jan 02 18:58:35 CET 2007 - mfabian@suse.de + +- Bugzilla #230030: make Russian and Czech man-pages display + correctly again in UTF-8 locales (has been broken by the + update to man-2.4.3). + ------------------------------------------------------------------- Tue Sep 5 11:59:42 CEST 2006 - rguenther@suse.de @@ -18,7 +25,7 @@ Tue Feb 28 18:12:58 CET 2006 - mfabian@suse.de - Bugzilla #148472: use -Tlatin1 instead of -Tascii8 for languages which used ISO-8859-1 as legacy encoding. - With -Tascii8, "\(:u" for ü won't work. + With -Tascii8, "\(:u" for ü ·¯®§t work. ------------------------------------------------------------------- Thu Feb 09 15:34:48 CET 2006 - mfabian@suse.de diff --git a/groff.spec b/groff.spec index 417d39c..892d217 100644 --- a/groff.spec +++ b/groff.spec @@ -1,7 +1,7 @@ # # spec file for package groff (Version 1.18.1.1) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -13,14 +13,14 @@ Name: groff BuildRequires: gcc-c++ %define build_groff_docu 1 # -License: GPL, BSD +License: BSD License and BSD-like, GNU General Public License (GPL) Group: Productivity/Publishing/Troff Provides: normal-groff, jgroff Obsoletes: jgroff Prereq: %fillup_prereq %install_info_prereq Autoreqprov: on Version: 1.18.1.1 -Release: 33 +Release: 52 Summary: GNU troff Document Formatting System URL: http://www.gnu.org/software/groff/groff.html Source0: ftp://ftp.gnu.org/gnu/groff/groff-1.18.1.1.tar.bz2 @@ -167,6 +167,10 @@ popd /var/adm/fillup-templates/sysconfig.suseconfig-groff %changelog -n groff +* Tue Jan 02 2007 - mfabian@suse.de +- Bugzilla #230030: make Russian and Czech man-pages display + correctly again in UTF-8 locales (has been broken by the + update to man-2.4.3). * Tue Sep 05 2006 - rguenther@suse.de - Split gxdview to a separate spec file. * Mon Sep 04 2006 - rguenther@suse.de @@ -176,7 +180,7 @@ popd * Tue Feb 28 2006 - mfabian@suse.de - Bugzilla #148472: use -Tlatin1 instead of -Tascii8 for languages which used ISO-8859-1 as legacy encoding. - With -Tascii8, "\(:u" for ü won't work. + With -Tascii8, "\(:u" for ü ·¯®§t work. * Thu Feb 09 2006 - mfabian@suse.de - Bugzilla #148922: nroff hangs when input comes from a file and not from a pipe: Improfe UTF-8 workaround to handle this diff --git a/gxdview.changes b/gxdview.changes index 587d7a6..01f7864 100644 --- a/gxdview.changes +++ b/gxdview.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jan 02 18:58:35 CET 2007 - mfabian@suse.de + +- Bugzilla #230030: make Russian and Czech man-pages display + correctly again in UTF-8 locales (has been broken by the + update to man-2.4.3). + ------------------------------------------------------------------- Tue Sep 5 12:00:12 CEST 2006 - rguenther@suse.de diff --git a/gxdview.spec b/gxdview.spec index f3c4d93..4fe4c60 100644 --- a/gxdview.spec +++ b/gxdview.spec @@ -1,7 +1,7 @@ # # spec file for package gxdview (Version 1.18.1.1) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,13 +11,13 @@ Name: gxdview BuildRequires: gcc-c++ xorg-x11-devel -License: GPL +License: GNU General Public License (GPL) Group: Productivity/Publishing/Troff Autoreqprov: on Requires: groff Conflicts: jgxdview Version: 1.18.1.1 -Release: 33 +Release: 59 Summary: Ditroff Output Displayer for Groff URL: http://www.gnu.org/software/groff/groff.html Source0: ftp://ftp.gnu.org/gnu/groff/groff-1.18.1.1.tar.bz2 @@ -108,5 +108,9 @@ make -C src/xditview install.man MANSUFFIX=1 LIBMANSUFFIX=3 DESTDIR=$RPM_BUILD_R %config %{_datadir}/X11/app-defaults/GXditview %changelog -n gxdview +* Tue Jan 02 2007 - mfabian@suse.de +- Bugzilla #230030: make Russian and Czech man-pages display + correctly again in UTF-8 locales (has been broken by the + update to man-2.4.3). * Tue Sep 05 2006 - rguenther@suse.de - Split from groff spec file. diff --git a/utf8.patch b/utf8.patch index 214116f..f8b531e 100644 --- a/utf8.patch +++ b/utf8.patch @@ -1,7 +1,7 @@ diff -ru groff-1.18.1.1.orig/src/roff/nroff/nroff.sh groff-1.18.1.1/src/roff/nroff/nroff.sh --- groff-1.18.1.1.orig/src/roff/nroff/nroff.sh 2002-02-07 09:36:54.000000000 +0100 +++ groff-1.18.1.1/src/roff/nroff/nroff.sh 2006-02-09 15:33:14.000000000 +0100 -@@ -81,11 +87,159 @@ +@@ -81,11 +87,161 @@ shift done @@ -18,18 +18,20 @@ diff -ru groff-1.18.1.1.orig/src/roff/nroff/nroff.sh groff-1.18.1.1/src/roff/nro + export LC_ALL=ja_JP.eucJP + ICONV="iconv -f EUC-JP -t UTF-8" + ;; -+ cs*|hu*|hr*|pl*) -+ # Czech, Hungarian, ... in UTF-8 seem to need special treatment as well: -+ T=-Tascii8 -+ export LC_ALL=cs_CZ.ISO-8859-2 -+ ICONV="iconv -f ISO-8859-2 -t UTF-8" -+ ;; -+ ru_RU*) -+ # Russian man page sources are in KOI8-R -+ T=-Tascii8 -+ export LC_ALL=ru_RU.KOI8-R -+ ICONV="iconv -f KOI8-R -t UTF-8" -+ ;; ++# Czech, Hungarian, ... and Russian man-pages don't need special treatment in nroff anymore ++# with man-2.4.3 because man already does the necessary conversions (see bugzilla #230030). ++# cs*|hu*|hr*|pl*) ++# # Czech, Hungarian, ... in UTF-8 seem to need special treatment as well: ++# T=-Tascii8 ++# export LC_ALL=cs_CZ.ISO-8859-2 ++# ICONV="iconv -f ISO-8859-2 -t UTF-8" ++# ;; ++# ru_RU*) ++# # Russian man page sources are in KOI8-R ++# T=-Tascii8 ++# export LC_ALL=ru_RU.KOI8-R ++# ICONV="iconv -f KOI8-R -t UTF-8" ++# ;; + # make 'man iso-8859-15' display correctly in UTF-8 locales using Euro + ca_ES*|de_AT*|de_BE*|de_DE*|de_LU*|en_BE*|en_IE*|es_ES*|eu_ES*|fi_FI*|fr_BE*|fr_FR*|fr_LU*|ga_IE*|gl_ES*|it_IT*|nl_BE*|nl_NL*|pt_PT*|sv_FI*|wa_BE*) + T=-Tlatin1