diff --git a/.cvsignore b/.cvsignore index 62456da..d5c6085 100644 --- a/.cvsignore +++ b/.cvsignore @@ -17,3 +17,4 @@ man-pages-ja-20050715.tar.gz man-pages-ja-20050815.tar.gz man-pages-ja-20050915.tar.gz man-pages-ja-20051015.tar.gz +man-pages-ja-20051115.tar.gz diff --git a/man-pages-ja-20050215-ls.patch b/man-pages-ja-20050215-ls.patch new file mode 100644 index 0000000..9d63298 --- /dev/null +++ b/man-pages-ja-20050215-ls.patch @@ -0,0 +1,59 @@ +--- man-pages-ja-20050215.orig/manual/GNU_fileutils/man1/ls.1 2005-02-15 00:12:06.000000000 +0900 ++++ man-pages-ja-20050215/manual/GNU_fileutils/man1/ls.1 2005-11-18 21:30:23.000000000 +0900 +@@ -47,7 +47,8 @@ + .TP + \fB\-c\fR + �ǽ��ѹ�����ǥ����Ȥ��롣 +-���ץ���� `\fB\-l\fR' ��ȼ�����Ϻǽ��ѹ������ɽ�����롣 ++���ץ���� \fB\-lt\fR ��ȼ�����ˤϺǽ��ѹ������ɽ�����롣 ++���ץ���� \fB\-l\fR �Τߤξ��ˤ�̾���ǥ����Ȥ��졢�ǽ��ѹ������ɽ�����롣 + .TP + \fB\-C\fR + ʣ����ǥꥹ��ɽ�����롣 +@@ -57,7 +58,7 @@ + WHEN�� `never', `always', `auto' �Τ����줫�� + .TP + \fB\-d\fR, \fB\-\-directory\fR +-�ǥ��쥯�ȥ����Ȥ�ɽ����������ˡ��ǥ��쥯�ȥ�̾��ꥹ��ɽ�����롣 ++�ǥ��쥯�ȥ����Ȥ�ɽ����������ˡ��ǥ��쥯�ȥ�̾��ꥹ��ɽ����������ܥ�å���󥯤򻲾Ȥ��ʤ��� + .TP + \fB\-D\fR, \fB\-\-dired\fR + Emacs�Υǥ��쥯�ȥꥨ�ǥ����⡼�ɤΤ����ɬ�פʾ�����������롣 +@@ -94,7 +95,7 @@ + ���֤˴ؤ�������ɸ��ξ�ά�����ǤϤʤ������ʷ����ǥꥹ��ɽ�����롣 + .TP + \fB\-g\fR +-̵�뤵��롣 ++��ͭ�Ծ����ޤޤʤ��ꥹ�Ȥ�ɽ�����롣 + .TP + \fB\-G\fR, \fB\-\-no\-group\fR + ���롼�׾����ɽ�����ʤ��� +@@ -102,10 +103,16 @@ + \fB\-h\fR, \fB\-\-human\-readable\fR + �ͤ��ɤ߰פ�����(�㤨�� 1K 234M 2G)��ɽ�����롣 + .TP +-\fB\-H\fR, \fB\-\-si\fR ++\fB\-\-si\fR + Ʊ�塣â����1024��ñ�̤ǤϤʤ�1000��ñ�̤��Ѥ��롣 + (����: si�ȤϹ��ñ�̷ϤΤ��ȡ�) + .TP ++\fB\-H\fR, \fB\-\-dereference\-command\-line\fR ++���ޥ�ɥ饤��˻��ꤷ������ܥ�å���󥯤򻲾Ȥ���ɽ�����롣 ++.TP ++\fB\-\-dereference\-command\-line\-symlink\-to\-dir\fR ++���ޥ�ɥ饤��˻��ꤷ���ǥ��쥯�ȥ��ؤ�����ܥ�å���󥯤򻲾Ȥ���ɽ�����롣 ++.TP + \fB\-\-indicator\-style\fR=\fIWORD\fR + WORD�ǻ��ꤵ�줿��������˽��äơ��ե����륿���פ򼨤������ղä���ɽ�����롣 + \fIWORD\fR �Ȥ��Ƥϼ���ʸ��������Ǥ��� : +@@ -117,8 +124,8 @@ + \fB\-I\fR, \fB\-\-ignore\fR=\fIPATTERN\fR + ������ѥ�����PATTERN�˥ޥå�����̾���Υե�����ϥꥹ��ɽ�����ʤ� �� + .TP +-\fB\-k\fR, \fB\-\-kilobytes\fR +-\fB\-\-block\-size\fR=\fI1024\fR��Ʊ�͡� ++\fB\-k\fR ++\fB\-\-block\-size\fR=\fI1K\fR��Ʊ�͡� + .TP + \fB\-l\fR + Ĺ�������ǥꥹ��ɽ�����롣 diff --git a/man-pages-ja-20051115-libaio.patch b/man-pages-ja-20051115-libaio.patch new file mode 100644 index 0000000..938f224 --- /dev/null +++ b/man-pages-ja-20051115-libaio.patch @@ -0,0 +1,149 @@ +diff -ruN man-pages-ja-20051115.orig/manual/LDP_man-pages/man2/io_cancel.2 man-pages-ja-20051115/manual/LDP_man-pages/man2/io_cancel.2 +--- man-pages-ja-20051115.orig/manual/LDP_man-pages/man2/io_cancel.2 2005-11-15 00:07:07.000000000 +0900 ++++ man-pages-ja-20051115/manual/LDP_man-pages/man2/io_cancel.2 2005-11-21 19:01:50.000000000 +0900 +@@ -33,19 +33,19 @@ + .ad l + .hy 0 + +-#include ++#include + .sp + .HP 16 +-long\ \fBio_cancel\fR\ (aio_context_t\ \fIctx_id\fR, struct\ iocb\ \fI*iocb\fR, struct\ io_event\ \fI*result\fR); ++int\ \fBio_cancel\fR\ (io_context_t\ \fIctx\fR, struct\ iocb\ \fI*iocb\fR, struct\ io_event\ \fI*evt\fR); + .ad + .hy + + .SH ���� + .PP + \fBio_cancel\fR() �ϡ������� \fBio_submit\fR �����ƥࡦ�������Ȥä���Ͽ���줿 +-��Ʊ�� I/O (AIO) ���μ��ä���Ԥ����Ȥ��롣 \fIctx_id\fR �ϡ����ä���Ԥ� ++��Ʊ�� I/O (AIO) ���μ��ä���Ԥ����Ȥ��롣 \fIctx\fR �ϡ����ä���Ԥ� + ���� AIO ����ƥ����Ȥ� ID �Ǥ��롣���ꤷ�� AIO ����ƥ����Ȥ����Ĥ���ȡ� +-�оݤΥ��٥�Ȥμ��ä����Ԥ�졢���θ� \fIresult\fR �ǻؤ��줿����� ++�оݤΥ��٥�Ȥμ��ä����Ԥ�졢���θ� \fIevt\fR �ǻؤ��줿����� + ���ԡ������ (���ΤȤ�����λ���塼�ؤΰ�ư�ϹԤ��ʤ�)�� + .SH �֤��� + .PP +@@ -55,7 +55,7 @@ + .SH ���顼 + .TP + EINVAL +-\fIctx_id\fR �ǻ��ꤵ�줿 AIO ����ƥ����Ȥ�̵���Ǥ��롣 ++\fIctx\fR �ǻ��ꤵ�줿 AIO ����ƥ����Ȥ�̵���Ǥ��롣 + .TP + EFAULT + �ǡ�����¤�����̵���ʥǡ�����ؤ��Ƥ����Τ����롣 +diff -ruN man-pages-ja-20051115.orig/manual/LDP_man-pages/man2/io_destroy.2 man-pages-ja-20051115/manual/LDP_man-pages/man2/io_destroy.2 +--- man-pages-ja-20051115.orig/manual/LDP_man-pages/man2/io_destroy.2 2005-11-15 00:07:07.000000000 +0900 ++++ man-pages-ja-20051115/manual/LDP_man-pages/man2/io_destroy.2 2005-11-21 19:02:15.000000000 +0900 +@@ -30,10 +30,10 @@ + .ad l + .hy 0 + +-#include ++#include + .sp + .HP 17 +-long\ \fBio_destroy\fR\ (aio_context_t\ \fIctx\fR); ++int\ \fBio_destroy\fR\ (io_context_t\ \fIctx\fR); + .ad + .hy + +diff -ruN man-pages-ja-20051115.orig/manual/LDP_man-pages/man2/io_getevents.2 man-pages-ja-20051115/manual/LDP_man-pages/man2/io_getevents.2 +--- man-pages-ja-20051115.orig/manual/LDP_man-pages/man2/io_getevents.2 2005-11-15 00:07:07.000000000 +0900 ++++ man-pages-ja-20051115/manual/LDP_man-pages/man2/io_getevents.2 2005-11-21 19:02:49.000000000 +0900 +@@ -36,11 +36,11 @@ + + .sp + +-#include ++#include + + .sp + .HP 19 +-long\ \fBio_getevents\fR\ (aio_context_t\ \fIctx_id\fR, long\ \fImin_nr\fR, long\ \fInr\fR, struct\ io_event\ \fI*events\fR, struct\ timespec\ \fI*timeout\fR); ++int\ \fBio_getevents\fR\ (io_context_t\ \fIctx_id\fR, long\ \fImin_nr\fR, long\ \fInr\fR, struct\ io_event\ \fI*events\fR, struct\ timespec\ \fI*timeout\fR); + .ad + .hy + +diff -ruN man-pages-ja-20051115.orig/manual/LDP_man-pages/man2/io_setup.2 man-pages-ja-20051115/manual/LDP_man-pages/man2/io_setup.2 +--- man-pages-ja-20051115.orig/manual/LDP_man-pages/man2/io_setup.2 2005-11-15 00:07:07.000000000 +0900 ++++ man-pages-ja-20051115/manual/LDP_man-pages/man2/io_setup.2 2005-11-21 19:04:18.000000000 +0900 +@@ -30,15 +30,15 @@ + .ad l + .hy 0 + +-#include ++#include + .sp + .HP 15 +-long\ \fBio_setup\fR\ (unsigned\ \fInr_events\fR, aio_context_t\ \fI*ctxp\fR); ++int\ \fBio_setup\fR\ (int\ \fImaxevents\fR, io_context_t\ \fI*ctxp\fR); + .ad + .hy + .SH ���� + .PP +-\fBio_setup\fR() �ϡ����ʤ��Ȥ� \fInr_events\fR �ĤΥ��٥�Ȥ������ǽ�� ++\fBio_setup\fR() �ϡ����ʤ��Ȥ� \fImaxevents\fR �ĤΥ��٥�Ȥ������ǽ�� + ��Ʊ�� I/O (AIO) ����ƥ����Ȥκ�����Ԥ��� + \fIctxp\fR �ϡ����Ǥ�¸�ߤ��� AIO ����ƥ����Ȥ�ؤ��Ƥ��ƤϤʤ餺�� + \fBio_setup\fR() �θƤӽФ������� 0 �˽��������Ƥ��ʤ���Фʤ�ʤ��� +@@ -52,8 +52,8 @@ + .SH ���顼 + .TP + EINVAL +-\fIctxp\fR �����������Ƥ��ʤ��������ꤵ�줿 \fInr_events\fR �� +-�����������ͤ�ۤ��Ƥ��롣�ޤ��� \fInr_events\fR �� 0 ����礭���ͤ� ++\fIctxp\fR �����������Ƥ��ʤ��������ꤵ�줿 \fImaxevents\fR �� ++�����������ͤ�ۤ��Ƥ��롣�ޤ��� \fImaxevents\fR �� 0 ����礭���ͤ� + ���ꤹ�٤��Ǥ��롣 + .TP + EFAULT +@@ -63,7 +63,7 @@ + ɬ�פʥ����ͥ롦�꥽�����������ʤ��� + .TP + EAGAIN +-���ꤵ�줿 \fInr_events\fR ���桼�������ѤǤ��륤�٥�ȿ��ξ�¤�ۤ��Ƥ��롣 ++���ꤵ�줿 \fImaxevents\fR ���桼�������ѤǤ��륤�٥�ȿ��ξ�¤�ۤ��Ƥ��롣 + .TP + ENOSYS + \fBio_setup\fR() �����Υ������ƥ�����Ǥϼ�������Ƥ��ʤ��� +diff -ruN man-pages-ja-20051115.orig/manual/LDP_man-pages/man2/io_submit.2 man-pages-ja-20051115/manual/LDP_man-pages/man2/io_submit.2 +--- man-pages-ja-20051115.orig/manual/LDP_man-pages/man2/io_submit.2 2005-11-15 00:07:07.000000000 +0900 ++++ man-pages-ja-20051115/manual/LDP_man-pages/man2/io_submit.2 2005-11-21 19:05:43.000000000 +0900 +@@ -30,18 +30,18 @@ + .ad l + .hy 0 + +-#include ++#include + .sp + .HP 16 +-long\ \fBio_submit\fR\ (aio_context_t\ \fIctx_id\fR, long\ \fInr\fR, struct\ iocb\ \fI**iocbpp\fR); ++int\ \fBio_submit\fR\ (io_context_t\ \fIctx\fR, long\ \fInr\fR, struct\ iocb\ \fI**ios[]\fR); + .ad + .hy + + .SH ���� + .PP +-\fBio_submit\fR() �ϡ�AIO ����ƥ����� \fIctx_id\fR �� \fInr\fR �Ĥ� I/O ++\fBio_submit\fR() �ϡ�AIO ����ƥ����� \fIctx\fR �� \fInr\fR �Ĥ� I/O + �ꥯ�����Ȥ�����Ԥ��Ȥ��ƥ��塼���ɲä��롣 +-\fIiocbpp\fR �ϡ�AIO ����ƥ����� \fIctx_id\fR ����Ͽ����� \fInr\fR �Ĥ� ++\fIios\fR �ϡ�AIO ����ƥ����� \fIctx\fR ����Ͽ����� \fInr\fR �Ĥ� + AIO �ꥯ�����ȡ��֥��å�������ˤʤäƤ��ʤ���Фʤ�ʤ��� + .SH �֤��� + .PP +@@ -50,9 +50,9 @@ + .SH ���顼 + .TP + EINVAL +-\fIctx_id\fR �ǻ��ꤵ�줿 \fIaio_context\fR ��̵���Ǥ��롣 ++\fIctx\fR �ǻ��ꤵ�줿 \fIio_context\fR ��̵���Ǥ��롣 + \fInr\fR �� 0 ̤���Ǥ��롣 +-*iocbpp[0] �� \fIiocb\fR ��Ŭ�ڤ˽��������Ƥ��ʤ����� ++*ios[0] �� \fIiocb\fR ��Ŭ�ڤ˽��������Ƥ��ʤ����� + ���ꤵ�줿������ \fIiocb\fR ��Υե����롦�ǥ�������ץ����Ф��� + ̵���Ǥ��롣 + .TP diff --git a/man-pages-ja.spec b/man-pages-ja.spec index 0ed2cc8..013afb8 100644 --- a/man-pages-ja.spec +++ b/man-pages-ja.spec @@ -1,4 +1,4 @@ -%define manver 20051015 +%define manver 20051115 %define use_utf8 1 Summary: Japanese man (manual) pages from the Japanese Manual Project @@ -17,6 +17,8 @@ Patch: %{name}-20010515-rh.patch Patch1: %{name}-20011115-fixpipe.patch Patch2: %{name}-20030415-utf8.patch Patch3: %{name}-20031215-crontab-0days.patch +Patch5: man-pages-ja-20051115-libaio.patch +Patch8: man-pages-ja-20050215-ls.patch %description Japanese Manual pages, translated by JM-Project (Japanese Manual Project). @@ -29,6 +31,8 @@ Japanese Manual pages, translated by JM-Project (Japanese Manual Project). %patch2 -p1 -b .utf8 %endif %patch3 -p1 -b .0days +%patch5 -p1 -b .libaio +%patch8 -p1 -b .ls %build perl %{SOURCE1} $RPM_BUILD_ROOT | make @@ -95,6 +99,12 @@ done %changelog +* Mon Nov 21 2005 Akira TAGOH - 20051115-1 +- updates to 20051115. +- man-pages-ja-20051115-libaio.patch: fixed a misleading of the header file + required and a typo. +- man-pages-ja-20050215-ls.patch: fixed the -H option's explanation. + * Thu Oct 20 2005 Akira TAGOH - 20051015-1 - updates to 20051015. - man-pages-ja-20050215-shmget.patch: no longer needed. merged into upstream. diff --git a/sources b/sources index ba39683..deeb230 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fbc4c3bf09038ff0765596103fd37062 man-pages-ja-20051015.tar.gz +af0b07f8b932302e4c71d6ca9273b097 man-pages-ja-20051115.tar.gz