This commit is contained in:
parent
9c27c5fca5
commit
1d5d8e801f
@ -1,25 +1,29 @@
|
|||||||
diff -ru groff-1.18.1.1.orig//font/devutf8/R.proto groff-1.18.1.1/font/devutf8/R.proto
|
diff -ru groff-1.18.1.1.orig//font/devutf8/R.proto groff-1.18.1.1/font/devutf8/R.proto
|
||||||
--- groff-1.18.1.1.orig//font/devutf8/R.proto 2002-07-19 09:58:45.000000000 +0200
|
--- groff-1.18.1.1.orig//font/devutf8/R.proto 2002-07-19 09:58:45.000000000 +0200
|
||||||
+++ groff-1.18.1.1/font/devutf8/R.proto 2008-11-20 17:45:46.000000000 +0100
|
+++ groff-1.18.1.1/font/devutf8/R.proto 2008-11-25 14:58:19.000000000 +0100
|
||||||
@@ -285,13 +285,10 @@
|
@@ -285,13 +285,13 @@
|
||||||
+h 24 0 0x03D1
|
+h 24 0 0x03D1
|
||||||
+f 24 0 0x03D5
|
+f 24 0 0x03D5
|
||||||
+p 24 0 0x03D6
|
+p 24 0 0x03D6
|
||||||
-- 24 0 0x2010
|
-- 24 0 0x2010
|
||||||
|
+- 24 0 0x002D
|
||||||
hy "
|
hy "
|
||||||
en 24 0 0x2013
|
en 24 0 0x2013
|
||||||
em 24 0 0x2014
|
em 24 0 0x2014
|
||||||
-` 24 0 0x2018
|
-` 24 0 0x2018
|
||||||
|
+` 24 0 0x0060
|
||||||
oq "
|
oq "
|
||||||
-' 24 0 0x2019
|
-' 24 0 0x2019
|
||||||
|
+' 24 0 0x0027
|
||||||
cq "
|
cq "
|
||||||
bq 24 0 0x201A
|
bq 24 0 0x201A
|
||||||
lq 24 0 0x201C
|
lq 24 0 0x201C
|
||||||
@@ -334,7 +331,6 @@
|
@@ -334,7 +334,7 @@
|
||||||
st 24 0 0x220B
|
st 24 0 0x220B
|
||||||
product 24 0 0x220F
|
product 24 0 0x220F
|
||||||
sum 24 0 0x2211
|
sum 24 0 0x2211
|
||||||
-\- 24 0 0x2212
|
-\- 24 0 0x2212
|
||||||
|
+\- 24 0 0x002D
|
||||||
mi "
|
mi "
|
||||||
** 24 0 0x2217
|
** 24 0 0x2217
|
||||||
sr 24 0 0x221A
|
sr 24 0 0x221A
|
||||||
|
@ -1,3 +1,26 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Nov 25 15:15:44 CET 2008 - mfabian@suse.de
|
||||||
|
|
||||||
|
- bnc#448185: improve workaround for bnc#446710. After the
|
||||||
|
tmandocdb workaround was removed from "man", the new
|
||||||
|
workaround in groff failed in some locales.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Nov 21 15:54:34 CET 2008 - mfabian@suse.de
|
||||||
|
|
||||||
|
- bnc#401952: Add a workaround to /usr/bin/nroff to make Korean
|
||||||
|
man-pages display correctly again.
|
||||||
|
- /etc/profile.d/groff.{sh,csh} moved to
|
||||||
|
/etc/profile.d/zzz-groff.{sh,csh} to be able to check for LANG.
|
||||||
|
Changes in these scripts:
|
||||||
|
• Don’t set GROFF_NO_SGR by default anymore, it causes problems
|
||||||
|
with Korean man pages.
|
||||||
|
• For CJK languages, set MAN_KEEP_FORMATTING by default.
|
||||||
|
Without MAN_KEEP_FORMATTING man will use GROFF_NO_SGR when
|
||||||
|
writing to a pipe or file and will also pipe the result
|
||||||
|
through "col -b -p -x". This doesn’t work well for CJK, at
|
||||||
|
least not with the current version of groff.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Nov 20 17:48:24 CET 2008 - mfabian@suse.de
|
Thu Nov 20 17:48:24 CET 2008 - mfabian@suse.de
|
||||||
|
|
||||||
|
@ -1,8 +0,0 @@
|
|||||||
#
|
|
||||||
# /etc/profile.d/groff.csh
|
|
||||||
#
|
|
||||||
|
|
||||||
# setting the variable GROFF_NO_SGR to to something not empty
|
|
||||||
# to disable the use of ANSI colour sequences by default.
|
|
||||||
|
|
||||||
setenv GROFF_NO_SGR yes
|
|
8
groff.sh
8
groff.sh
@ -1,8 +0,0 @@
|
|||||||
#
|
|
||||||
# /etc/profile.d/groff.sh
|
|
||||||
#
|
|
||||||
|
|
||||||
# setting the variable GROFF_NO_SGR to to something not empty
|
|
||||||
# to disable the use of ANSI colour sequences by default.
|
|
||||||
|
|
||||||
export GROFF_NO_SGR=yes
|
|
29
groff.spec
29
groff.spec
@ -29,15 +29,15 @@ Obsoletes: jgroff
|
|||||||
PreReq: %fillup_prereq %install_info_prereq
|
PreReq: %fillup_prereq %install_info_prereq
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
Version: 1.18.1.1
|
Version: 1.18.1.1
|
||||||
Release: 166
|
Release: 167
|
||||||
Summary: GNU troff Document Formatting System
|
Summary: GNU troff Document Formatting System
|
||||||
Url: http://www.gnu.org/software/groff/groff.html
|
Url: http://www.gnu.org/software/groff/groff.html
|
||||||
# cvs -z3 -d:pserver:anonymous@cvs.savannah.gnu.org:/sources/groff co groff
|
# cvs -z3 -d:pserver:anonymous@cvs.savannah.gnu.org:/sources/groff co groff
|
||||||
Source0: ftp://ftp.gnu.org/gnu/groff/groff-1.18.1.1.tar.bz2
|
Source0: ftp://ftp.gnu.org/gnu/groff/groff-1.18.1.1.tar.bz2
|
||||||
Source1: SuSEconfig.groff
|
Source1: SuSEconfig.groff
|
||||||
Source2: sysconfig.suseconfig-groff
|
Source2: sysconfig.suseconfig-groff
|
||||||
Source3: groff.sh
|
Source3: zzz-groff.sh
|
||||||
Source4: groff.csh
|
Source4: zzz-groff.csh
|
||||||
Patch0: groff_1.18.1.1-1-debian.diff.bz2
|
Patch0: groff_1.18.1.1-1-debian.diff.bz2
|
||||||
Patch1: suse.patch
|
Patch1: suse.patch
|
||||||
Patch2: pic-html.patch
|
Patch2: pic-html.patch
|
||||||
@ -141,8 +141,8 @@ echo "papersize a4" > $RPM_BUILD_ROOT/etc/papersize
|
|||||||
chmod 0644 $RPM_BUILD_ROOT/etc/papersize
|
chmod 0644 $RPM_BUILD_ROOT/etc/papersize
|
||||||
# install profiles to disable the use of ANSI colour sequences by default:
|
# install profiles to disable the use of ANSI colour sequences by default:
|
||||||
mkdir -p $RPM_BUILD_ROOT/etc/profile.d
|
mkdir -p $RPM_BUILD_ROOT/etc/profile.d
|
||||||
install -m 644 $RPM_SOURCE_DIR/groff.sh $RPM_BUILD_ROOT/etc/profile.d
|
install -m 644 $RPM_SOURCE_DIR/zzz-groff.sh $RPM_BUILD_ROOT/etc/profile.d
|
||||||
install -m 644 $RPM_SOURCE_DIR/groff.csh $RPM_BUILD_ROOT/etc/profile.d
|
install -m 644 $RPM_SOURCE_DIR/zzz-groff.csh $RPM_BUILD_ROOT/etc/profile.d
|
||||||
pushd $RPM_BUILD_ROOT/usr/share/groff
|
pushd $RPM_BUILD_ROOT/usr/share/groff
|
||||||
test -d 1.18.1 || exit 1
|
test -d 1.18.1 || exit 1
|
||||||
ln -s 1.18.1 current
|
ln -s 1.18.1 current
|
||||||
@ -167,7 +167,7 @@ popd
|
|||||||
/usr/bin/*
|
/usr/bin/*
|
||||||
%doc %{_mandir}/man?/*
|
%doc %{_mandir}/man?/*
|
||||||
%config(noreplace) %verify(not md5 size mtime) /etc/papersize
|
%config(noreplace) %verify(not md5 size mtime) /etc/papersize
|
||||||
%config /etc/profile.d/groff.*sh
|
%config /etc/profile.d/zzz-groff.*sh
|
||||||
%dir /usr/share/groff/
|
%dir /usr/share/groff/
|
||||||
%dir /usr/share/groff/site-tmac/
|
%dir /usr/share/groff/site-tmac/
|
||||||
/usr/share/groff/site-tmac/*
|
/usr/share/groff/site-tmac/*
|
||||||
@ -191,6 +191,23 @@ popd
|
|||||||
/var/adm/fillup-templates/sysconfig.suseconfig-groff
|
/var/adm/fillup-templates/sysconfig.suseconfig-groff
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Nov 25 2008 mfabian@suse.de
|
||||||
|
- bnc#448185: improve workaround for bnc#446710. After the
|
||||||
|
tmandocdb workaround was removed from "man", the new
|
||||||
|
workaround in groff failed in some locales.
|
||||||
|
* Fri Nov 21 2008 mfabian@suse.de
|
||||||
|
- bnc#401952: Add a workaround to /usr/bin/nroff to make Korean
|
||||||
|
man-pages display correctly again.
|
||||||
|
- /etc/profile.d/groff.{sh,csh} moved to
|
||||||
|
/etc/profile.d/zzz-groff.{sh,csh} to be able to check for LANG.
|
||||||
|
Changes in these scripts:
|
||||||
|
• Don’t set GROFF_NO_SGR by default anymore, it causes problems
|
||||||
|
with Korean man pages.
|
||||||
|
• For CJK languages, set MAN_KEEP_FORMATTING by default.
|
||||||
|
Without MAN_KEEP_FORMATTING man will use GROFF_NO_SGR when
|
||||||
|
writing to a pipe or file and will also pipe the result
|
||||||
|
through "col -b -p -x". This doesn’t work well for CJK, at
|
||||||
|
least not with the current version of groff.
|
||||||
* Thu Nov 20 2008 mfabian@suse.de
|
* Thu Nov 20 2008 mfabian@suse.de
|
||||||
- bnc#446710: add the workarounds from
|
- bnc#446710: add the workarounds from
|
||||||
/usr/share/groff/site-tmac/tmac.andocdb (man package) directly
|
/usr/share/groff/site-tmac/tmac.andocdb (man package) directly
|
||||||
|
@ -25,14 +25,12 @@ AutoReqProv: on
|
|||||||
Requires: groff
|
Requires: groff
|
||||||
Conflicts: jgxdview
|
Conflicts: jgxdview
|
||||||
Version: 1.18.1.1
|
Version: 1.18.1.1
|
||||||
Release: 207
|
Release: 208
|
||||||
Summary: Ditroff Output Displayer for Groff
|
Summary: Ditroff Output Displayer for Groff
|
||||||
Url: http://www.gnu.org/software/groff/groff.html
|
Url: http://www.gnu.org/software/groff/groff.html
|
||||||
Source0: ftp://ftp.gnu.org/gnu/groff/groff-1.18.1.1.tar.bz2
|
Source0: ftp://ftp.gnu.org/gnu/groff/groff-1.18.1.1.tar.bz2
|
||||||
Source1: SuSEconfig.groff
|
Source1: SuSEconfig.groff
|
||||||
Source2: sysconfig.suseconfig-groff
|
Source2: sysconfig.suseconfig-groff
|
||||||
Source3: groff.sh
|
|
||||||
Source4: groff.csh
|
|
||||||
Patch0: groff_1.18.1.1-1-debian.diff.bz2
|
Patch0: groff_1.18.1.1-1-debian.diff.bz2
|
||||||
Patch1: suse.patch
|
Patch1: suse.patch
|
||||||
Patch2: pic-html.patch
|
Patch2: pic-html.patch
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
diff -ru groff-1.18.1.1.orig/src/roff/nroff/nroff.sh groff-1.18.1.1/src/roff/nroff/nroff.sh
|
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 2007-07-23 19:22:48.000000000 +0200
|
--- groff-1.18.1.1.orig/src/roff/nroff/nroff.sh 2007-07-23 19:22:48.000000000 +0200
|
||||||
+++ groff-1.18.1.1/src/roff/nroff/nroff.sh 2007-07-23 19:27:54.000000000 +0200
|
+++ groff-1.18.1.1/src/roff/nroff/nroff.sh 2007-07-23 19:27:54.000000000 +0200
|
||||||
@@ -87,11 +87,178 @@
|
@@ -87,11 +87,183 @@
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
|
|
||||||
@ -102,6 +102,11 @@ diff -ru groff-1.18.1.1.orig/src/roff/nroff/nroff.sh groff-1.18.1.1/src/roff/nro
|
|||||||
+ export LC_ALL=zh_CN.GB18030
|
+ export LC_ALL=zh_CN.GB18030
|
||||||
+ ICONV="iconv -f GB18030 -t UTF-8"
|
+ ICONV="iconv -f GB18030 -t UTF-8"
|
||||||
+ ;;
|
+ ;;
|
||||||
|
+ ko*)
|
||||||
|
+ T=-Tlatin1
|
||||||
|
+ export LC_ALL=ko_KR.EUC-KR
|
||||||
|
+ ICONV="iconv -f EUC-KR -t UTF-8"
|
||||||
|
+ ;;
|
||||||
+# Czech, Hungarian, ... and Russian man-pages don't need special treatment in nroff anymore
|
+# 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).
|
+# with man-2.4.3 because man already does the necessary conversions (see bugzilla #230030).
|
||||||
+# cs*|hu*|hr*|pl*)
|
+# cs*|hu*|hr*|pl*)
|
||||||
|
17
zzz-groff.csh
Normal file
17
zzz-groff.csh
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
#
|
||||||
|
# /etc/profile.d/zzz-groff.csh
|
||||||
|
#
|
||||||
|
# This script must be executed after setting the LANG variable.
|
||||||
|
|
||||||
|
|
||||||
|
switch ( $LANG )
|
||||||
|
case ja*:
|
||||||
|
setenv MAN_KEEP_FORMATTING yes
|
||||||
|
unsetenv GROFF_NO_SGR
|
||||||
|
case zh*:
|
||||||
|
setenv MAN_KEEP_FORMATTING yes
|
||||||
|
unsetenv GROFF_NO_SGR
|
||||||
|
case ko*:
|
||||||
|
setenv MAN_KEEP_FORMATTING yes
|
||||||
|
unsetenv GROFF_NO_SGR
|
||||||
|
endsw
|
12
zzz-groff.sh
Normal file
12
zzz-groff.sh
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
#
|
||||||
|
# /etc/profile.d/zzz-groff.sh
|
||||||
|
#
|
||||||
|
# This script must be executed after setting the LANG variable.
|
||||||
|
|
||||||
|
case "${LANGUAGE-${LC_ALL-${LC_MESSAGES-${LANG}}}}" in
|
||||||
|
ja*|zh*|ko*)
|
||||||
|
unset GROFF_NO_SGR
|
||||||
|
export MAN_KEEP_FORMATTING=yes
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
Loading…
Reference in New Issue
Block a user