diff --git a/.cvsignore b/.cvsignore index 5ee7687..589aa5f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -43,3 +43,4 @@ man-pages-ja-20080215.tar.gz man-pages-ja-20080315.tar.gz man-pages-ja-20080415.tar.gz man-pages-ja-20080515.tar.gz +man-pages-ja-20080815.tar.gz diff --git a/man-pages-ja-455016-bash.1.patch b/man-pages-ja-455016-bash.1.patch new file mode 100644 index 0000000..2fe17ac --- /dev/null +++ b/man-pages-ja-455016-bash.1.patch @@ -0,0 +1,19 @@ +--- man-pages-ja-20060815/manual/GNU_bash/man1/bash.1.original 2008-08-05 19:39:36.000000000 +0900 ++++ man-pages-ja-20060815/manual/GNU_bash/man1/bash.1 2008-08-05 19:39:24.000000000 +0900 +@@ -7557,12 +7557,13 @@ + .SM + .B SIGCONT + �����ʥ��������ޤǡ�������μ¹Ԥ򥵥��ڥ�ɤ��ޤ��� ++.B suspend ++�ϡ��������󥷥���򥵥��ڥ�ɤǤ��ޤ��󡣤������� + .B \-f +-���ץ�����Ϳ������硢�����뤬�������󥷥���Ǥ��äƤ�ٹ��Ф��ޤ��� +-���������ɤ���ˤ��襵���ڥ�ɤϤ��ޤ��� ++���ץ�����Ϳ������硢�����뤬�������󥷥���Ǥ��äƤ⥵���ڥ�ɤǤ��ޤ��� + �����뤬�������󥷥��뤫�� + .B \-f +-��Ϳ�����Ƥ��ʤ����ȡ���������椬ͭ���Ǥʤ����Ȥ�����ơ� ++��Ϳ�����Ƥ��ʤ���硢�ޤ��ϥ�������椬ͭ���Ǥʤ���������ơ� + �ֵѥ��ơ������� 0 �Ǥ��� + .TP + .PD 0 diff --git a/man-pages-ja-456263-top.1.patch b/man-pages-ja-456263-top.1.patch new file mode 100644 index 0000000..ddf4628 --- /dev/null +++ b/man-pages-ja-456263-top.1.patch @@ -0,0 +1,13 @@ +diff -pruN man-pages-ja-20060815.orig/manual/procps/man1/top.1 man-pages-ja-20060815/manual/procps/man1/top.1 +--- man-pages-ja-20060815.orig/manual/procps/man1/top.1 2008-06-13 12:23:09.000000000 +0900 ++++ man-pages-ja-20060815/manual/procps/man1/top.1 2008-06-13 12:35:03.000000000 +0900 +@@ -310,6 +310,9 @@ ξ���򺮤��ƻ��Ѥ��뤳�Ȥ�Ǥ��롣 + \-\fBv\fR :\fB �С������\fR + �饤�֥��ΥС������Ȼ���ˡ�Υץ���ץȤ�ɽ�����ơ���λ���롣 + ++.TP 5 ++\-\fBM\fR :\fB ����ñ�̤򸡽�\fR ++����ñ��(k/M/G)�򸡽Ф���ư����������공�פ�ɽ�����롣 + + .\" ---------------------------------------------------------------------- + .SH 2. �ե������ / ����� diff --git a/man-pages-ja-fixpipe.patch b/man-pages-ja-fixpipe.patch new file mode 100644 index 0000000..1fb4436 --- /dev/null +++ b/man-pages-ja-fixpipe.patch @@ -0,0 +1,114 @@ +diff -ruN man-pages-ja-20080815.orig/script/configure.perl man-pages-ja-20080815/script/configure.perl +--- man-pages-ja-20080815.orig/script/configure.perl 2002-08-31 04:27:01.000000000 +0900 ++++ man-pages-ja-20080815/script/configure.perl 2008-08-23 16:59:12.000000000 +0900 +@@ -1,4 +1,5 @@ + #!/usr/bin/perl ++use IO::Handle; + use Env qw (PATH LANG); + use strict 'vars'; + +@@ -11,6 +12,13 @@ + my $PKGLIST = "script/pkgs.list"; + my @pack_method = ("none", "gzip", "bzip2", "compress"); + my $podsec = "1"; ++my @stdin; ++my $pipeflag = 0; ++ ++if ( -p STDIN ) { ++ $pipeflag = 1; ++ @stdin = STDIN->getlines; ++} + + # + # ���󥹥ȡ������ +@@ -21,7 +29,7 @@ + do{ + $MANROOT = "/usr/share/man/$LANG"; + print " Install directory [$MANROOT] ?: "; +- $ans = ; chomp $ans; ++ $ans = &get_from_stdin; chomp $ans; + if ($ans ne "") {$MANROOT = $ans;} + + print " compress manual with..\n"; +@@ -29,19 +37,19 @@ + print " $i: $pack_method[$i]\n"; + } + print " select [0..$#pack_method] : "; +- $ans = ; chomp $ans; ++ $ans = &get_from_stdin; chomp $ans; + if ($ans eq "") {$ans = 0;} + if ($ans < 0 || $ans > $#pack_method) {$PACK = $pack_method[0]} + else {$PACK = $pack_method[$ans]} + + $OWNER = "root"; + print " uname of page owner [$OWNER] ?: "; +- $ans = ; chomp $ans; ++ $ans = &get_from_stdin; chomp $ans; + if ($ans ne "") {$OWNER = $ans;} + + $GROUP = "root"; + print " group of page owner [$GROUP] ?: "; +- $ans = ; chomp $ans; ++ $ans = &get_from_stdin; chomp $ans; + if ($ans ne "") {$GROUP = $ans;} + + print "\n"; +@@ -51,7 +59,7 @@ + print "\n"; + do { + print "All OK? (Yes, [C]ontinue / No, [R]eselect) : "; +- $ans = ; chomp $ans; ++ $ans = &get_from_stdin; chomp $ans; + } until ($ans =~ /^[yYnNcCrR]/); + + } until ($ans =~ /^[yYcC]/); +@@ -90,14 +98,14 @@ + for $i (0 .. $#pl){ + my $qstr = ($main::pw{$pl[$i]} > -1) ? "[Y/n]" : "[y/N]"; + printf " [%2d/%2d] %-15s %s ?: ", $i, $#pl, $pl[$i], $qstr; +- $ans = ; chomp $ans; ++ $ans = &get_from_stdin; chomp $ans; + if ($ans =~ /[Yy].*/) { $main::pw{$pl[$i]} = $i;} + if ($ans =~ /[Nn].*/) { $main::pw{$pl[$i]} = -1;} + } + + do { + print "All OK? (Yes, [C]ontinue / No, [R]eselect) : "; +- $ans = ; chomp $ans; ++ $ans = &get_from_stdin; chomp $ans; + } until ($ans =~ /[yYnNcCrR].*/); + + } until ($ans =~ /^[yYcC]/); +@@ -161,7 +169,7 @@ + } + print " Which to install? (0..$cf) : "; + +- $ans = ; chomp $ans; ++ $ans = &get_from_stdin; chomp $ans; + if ($ans eq "") {$ans = 0}; + if ($ans < 0 || $ans > $cf) { $ans = 0 }; + +@@ -176,7 +184,7 @@ + + do { + print "All OK? (Yes, [C]ontinue / No, [R]eselect) : "; +- $ans = ; chomp $ans; ++ $ans = &get_from_stdin; chomp $ans; + } until ($ans =~ /^[yYnNcCrR]/); + + } until ($ans =~ /^[yYcC]/); +@@ -231,3 +239,14 @@ + ($af[2] <=> $bf[2]) || ($af[1] cmp $bf[1]); + } + ++sub get_from_stdin { ++ my $retval; ++ ++ if ( $pipeflag ) { ++ $retval = shift (@stdin); ++ } else { ++ $retval = scalar (); ++ } ++ return $retval; ++} ++ diff --git a/man-pages-ja.spec b/man-pages-ja.spec index 9be30d8..2242a52 100644 --- a/man-pages-ja.spec +++ b/man-pages-ja.spec @@ -1,8 +1,8 @@ %define use_utf8 1 Name: man-pages-ja -Version: 20080515 -Release: 2%{?dist} +Version: 20080815 +Release: 1%{?dist} # Actual license for each Japanese manpages is the same to the original English manpages' license. License: Freely redistributable without restriction BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -12,7 +12,7 @@ URL: http://www.linux.or.jp/JM/ Source: http://www.linux.or.jp/JM/%{name}-%{version}.tar.gz Source1: rh-man-pages-ja.pl Patch: %{name}-20010515-rh.patch -Patch1: %{name}-20011115-fixpipe.patch +Patch1: %{name}-fixpipe.patch Patch2: %{name}-20030415-utf8.patch Patch3: %{name}-20031215-crontab-0days.patch Patch8: man-pages-ja-20050215-ls.patch @@ -26,6 +26,8 @@ Patch16: man-pages-ja-20080415-connect.2.patch Patch17: man-pages-ja-432668-iptables.8.patch Patch18: man-pages-ja-433692-printf.1.patch Patch19: man-pages-ja-446881-bash.1.patch +Patch20: man-pages-ja-455016-bash.1.patch +Patch21: man-pages-ja-456263-top.1.patch Summary: Japanese man (manual) pages from the Japanese Manual Project Group: Documentation @@ -51,6 +53,8 @@ Japanese Manual pages, translated by JM-Project (Japanese Manual Project). %patch17 -p1 -b .iptables %patch18 -p1 -b .printf %patch19 -p1 -b .bash-continue +%patch20 -p1 -b .bash-suspend +%patch21 -p1 -b .top %build perl %{SOURCE1} '$DESTDIR' | make @@ -123,6 +127,11 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Sat Aug 23 2008 Akira TAGOH - 20080815-1 +- updates to 20080815. +- correct the description of 'suspend' built-in command in bash(1). +- correct the description of top(1) command. + * Fri May 23 2008 Akira TAGOH - 20080515-2 - correct the description of 'continue' built-in command in bash(1). diff --git a/sources b/sources index 19ab682..8d69a32 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -27c572a569e5d8872d2f434f39bd63f3 man-pages-ja-20080515.tar.gz +9a0ddb1318a964f6319371f50fc16b9f man-pages-ja-20080815.tar.gz