Author: arekm Date: Fri Apr 15 09:09:06 2011 GMT Module: packages Tag: HEAD ---- Log message: - rel 2; don't translate command names
---- Files affected: packages/xfsprogs: xfsprogs.spec (1.139 -> 1.140) , xfsprogs-notranslate.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/xfsprogs/xfsprogs.spec diff -u packages/xfsprogs/xfsprogs.spec:1.139 packages/xfsprogs/xfsprogs.spec:1.140 --- packages/xfsprogs/xfsprogs.spec:1.139 Fri Apr 1 18:56:36 2011 +++ packages/xfsprogs/xfsprogs.spec Fri Apr 15 11:09:01 2011 @@ -8,7 +8,7 @@ Summary(pl.UTF-8): Narzędzia do systemu plików XFS Name: xfsprogs Version: 3.1.5 -Release: 1 +Release: 2 License: LGPL v2.1 (libhandle), GPL v2 (the rest) Group: Applications/System Source0: ftp://linux-xfs.sgi.com/projects/xfs/cmd_tars/%{name}-%{version}.tar.gz @@ -18,6 +18,7 @@ Patch3: %{name}-pl.po-update.patch Patch4: %{name}-dynamic_exe.patch Patch5: %{name}-diet.patch +Patch6: %{name}-notranslate.patch URL: http://www.xfs.org/ BuildRequires: autoconf BuildRequires: automake @@ -126,6 +127,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build %{__aclocal} -I m4 @@ -298,6 +300,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.140 2011/04/15 09:09:01 arekm +- rel 2; don't translate command names + Revision 1.139 2011/04/01 16:56:36 qboosh - updated pl.po-update patch is back ================================================================ Index: packages/xfsprogs/xfsprogs-notranslate.patch diff -u /dev/null packages/xfsprogs/xfsprogs-notranslate.patch:1.1 --- /dev/null Fri Apr 15 11:09:06 2011 +++ packages/xfsprogs/xfsprogs-notranslate.patch Fri Apr 15 11:09:01 2011 @@ -0,0 +1,766 @@ +From 2005544d1ea1b4835c301a8fe92c24820d1147f0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <[email protected]> +Date: Fri, 15 Apr 2011 11:03:29 +0200 +Subject: [PATCH] [xfsprogs]: Don't translate command name. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Command names should never be translated. Currently there is +'xfs_quota -x -c "project"...' in one locale (C) while +'xfs_quota -x -c "projekt"...' in another (pl_PL). + +Signed-off-by: Arkadiusz Miśkiewicz <[email protected]> +--- + io/attr.c | 4 ++-- + io/bmap.c | 2 +- + io/fadvise.c | 2 +- + io/file.c | 8 ++++---- + io/freeze.c | 4 ++-- + io/fsync.c | 8 ++++---- + io/getrusage.c | 4 ++-- + io/imap.c | 2 +- + io/inject.c | 2 +- + io/madvise.c | 4 ++-- + io/mincore.c | 4 ++-- + io/mmap.c | 20 ++++++++++---------- + io/open.c | 20 ++++++++++---------- + io/parent.c | 2 +- + io/pread.c | 4 ++-- + io/prealloc.c | 14 +++++++------- + io/pwrite.c | 4 ++-- + io/resblks.c | 2 +- + io/sendfile.c | 4 ++-- + io/shutdown.c | 2 +- + io/truncate.c | 4 ++-- + libxcmd/help.c | 4 ++-- + libxcmd/quit.c | 4 ++-- + quota/edit.c | 8 ++++---- + quota/free.c | 4 ++-- + quota/path.c | 8 ++++---- + quota/project.c | 4 ++-- + quota/quot.c | 2 +- + quota/quota.c | 4 ++-- + quota/report.c | 6 +++--- + quota/state.c | 10 +++++----- + 31 files changed, 87 insertions(+), 87 deletions(-) + +diff --git a/io/attr.c b/io/attr.c +index 727c460..9b26f31 100644 +--- a/io/attr.c ++++ b/io/attr.c +@@ -333,7 +333,7 @@ chattr_f( + void + attr_init(void) + { +- chattr_cmd.name = _("chattr"); ++ chattr_cmd.name = "chattr"; + chattr_cmd.cfunc = chattr_f; + chattr_cmd.args = _("[-R|-D] [+/-"CHATTR_XFLAG_LIST"]"); + chattr_cmd.argmin = 1; +@@ -343,7 +343,7 @@ attr_init(void) + _("change extended inode flags on the currently open file"); + chattr_cmd.help = chattr_help; + +- lsattr_cmd.name = _("lsattr"); ++ lsattr_cmd.name = "lsattr"; + lsattr_cmd.cfunc = lsattr_f; + lsattr_cmd.args = _("[-R|-D|-a|-v]"); + lsattr_cmd.argmin = 0; +diff --git a/io/bmap.c b/io/bmap.c +index 55f956e..a78cbb1 100644 +--- a/io/bmap.c ++++ b/io/bmap.c +@@ -430,7 +430,7 @@ bmap_f( + void + bmap_init(void) + { +- bmap_cmd.name = _("bmap"); ++ bmap_cmd.name = "bmap"; + bmap_cmd.cfunc = bmap_f; + bmap_cmd.argmin = 0; + bmap_cmd.argmax = -1; +diff --git a/io/fadvise.c b/io/fadvise.c +index 5a76ebb..a27b8f7 100644 +--- a/io/fadvise.c ++++ b/io/fadvise.c +@@ -114,7 +114,7 @@ fadvise_f( + void + fadvise_init(void) + { +- fadvise_cmd.name = _("fadvise"); ++ fadvise_cmd.name = "fadvise"; + fadvise_cmd.cfunc = fadvise_f; + fadvise_cmd.argmin = 0; + fadvise_cmd.argmax = -1; +diff --git a/io/file.c b/io/file.c +index debab0f..db85ffc 100644 +--- a/io/file.c ++++ b/io/file.c +@@ -89,8 +89,8 @@ file_f( + void + file_init(void) + { +- file_cmd.name = _("file"); +- file_cmd.altname = _("f"); ++ file_cmd.name = "file"; ++ file_cmd.altname = "f"; + file_cmd.args = _("[N]"); + file_cmd.cfunc = file_f; + file_cmd.argmin = 0; +@@ -98,8 +98,8 @@ file_init(void) + file_cmd.flags = CMD_NOMAP_OK | CMD_FOREIGN_OK; + file_cmd.oneline = _("set the current file"); + +- print_cmd.name = _("print"); +- print_cmd.altname = _("p"); ++ print_cmd.name = "print"; ++ print_cmd.altname = "p"; + print_cmd.cfunc = print_f; + print_cmd.argmin = 0; + print_cmd.argmax = 0; +diff --git a/io/freeze.c b/io/freeze.c +index 08f4d47..89cd303 100644 +--- a/io/freeze.c ++++ b/io/freeze.c +@@ -62,14 +62,14 @@ thaw_f( + void + freeze_init(void) + { +- freeze_cmd.name = _("freeze"); ++ freeze_cmd.name = "freeze"; + freeze_cmd.cfunc = freeze_f; + freeze_cmd.argmin = 0; + freeze_cmd.argmax = 0; + freeze_cmd.flags = CMD_NOMAP_OK | CMD_FOREIGN_OK; + freeze_cmd.oneline = _("freeze filesystem of current file"); + +- thaw_cmd.name = _("thaw"); ++ thaw_cmd.name = "thaw"; + thaw_cmd.cfunc = thaw_f; + thaw_cmd.argmin = 0; + thaw_cmd.argmax = 0; +diff --git a/io/fsync.c b/io/fsync.c +index 83fc0f4..5ed8d25 100644 +--- a/io/fsync.c ++++ b/io/fsync.c +@@ -51,15 +51,15 @@ fdatasync_f( + void + fsync_init(void) + { +- fsync_cmd.name = _("fsync"); +- fsync_cmd.altname = _("s"); ++ fsync_cmd.name = "fsync"; ++ fsync_cmd.altname = "s"; + fsync_cmd.cfunc = fsync_f; + fsync_cmd.flags = CMD_NOMAP_OK | CMD_FOREIGN_OK; + fsync_cmd.oneline = + _("calls fsync(2) to flush all in-core file state to disk"); + +- fdatasync_cmd.name = _("fdatasync"); +- fdatasync_cmd.altname = _("ds"); ++ fdatasync_cmd.name = "fdatasync"; ++ fdatasync_cmd.altname = "ds"; + fdatasync_cmd.cfunc = fdatasync_f; + fdatasync_cmd.flags = CMD_NOMAP_OK | CMD_FOREIGN_OK; + fdatasync_cmd.oneline = +diff --git a/io/getrusage.c b/io/getrusage.c +index ba35c5d..32f2a7e 100644 +--- a/io/getrusage.c ++++ b/io/getrusage.c +@@ -109,8 +109,8 @@ getrusage_f( + void + getrusage_init(void) + { +- getrusage_cmd.name = _("getrusage"); +- getrusage_cmd.altname = _("g"); ++ getrusage_cmd.name = "getrusage"; ++ getrusage_cmd.altname = "g"; + getrusage_cmd.argmin = 0; + getrusage_cmd.argmax = -1; + getrusage_cmd.cfunc = getrusage_f; +diff --git a/io/imap.c b/io/imap.c +index 458a1fd..0a4f14e 100644 +--- a/io/imap.c ++++ b/io/imap.c +@@ -64,7 +64,7 @@ imap_f(int argc, char **argv) + void + imap_init(void) + { +- imap_cmd.name = _("imap"); ++ imap_cmd.name = "imap"; + imap_cmd.cfunc = imap_f; + imap_cmd.argmin = 0; + imap_cmd.argmax = 0; +diff --git a/io/inject.c b/io/inject.c +index 4be9d06..1e078ae 100644 +--- a/io/inject.c ++++ b/io/inject.c +@@ -148,7 +148,7 @@ inject_f( + void + inject_init(void) + { +- inject_cmd.name = _("inject"); ++ inject_cmd.name = "inject"; + inject_cmd.cfunc = inject_f; + inject_cmd.argmin = 0; + inject_cmd.argmax = -1; +diff --git a/io/madvise.c b/io/madvise.c +index 3235402..87f619d 100644 +--- a/io/madvise.c ++++ b/io/madvise.c +@@ -118,8 +118,8 @@ madvise_f( + void + madvise_init(void) + { +- madvise_cmd.name = _("madvise"); +- madvise_cmd.altname = _("ma"); ++ madvise_cmd.name = "madvise"; ++ madvise_cmd.altname = "ma"; + madvise_cmd.cfunc = madvise_f; + madvise_cmd.argmin = 0; + madvise_cmd.argmax = -1; +diff --git a/io/mincore.c b/io/mincore.c +index 60625ef..eac8699 100644 +--- a/io/mincore.c ++++ b/io/mincore.c +@@ -113,8 +113,8 @@ mincore_f( + void + mincore_init(void) + { +- mincore_cmd.name = _("mincore"); +- mincore_cmd.altname = _("mi"); ++ mincore_cmd.name = "mincore"; ++ mincore_cmd.altname = "mi"; + mincore_cmd.cfunc = mincore_f; + mincore_cmd.argmin = 0; + mincore_cmd.argmax = 2; +diff --git a/io/mmap.c b/io/mmap.c +index 29374ea..ea7498f 100644 +--- a/io/mmap.c ++++ b/io/mmap.c +@@ -577,8 +577,8 @@ mwrite_f( + void + mmap_init(void) + { +- mmap_cmd.name = _("mmap"); +- mmap_cmd.altname = _("mm"); ++ mmap_cmd.name = "mmap"; ++ mmap_cmd.altname = "mm"; + mmap_cmd.cfunc = mmap_f; + mmap_cmd.argmin = 0; + mmap_cmd.argmax = -1; +@@ -588,8 +588,8 @@ mmap_init(void) + _("mmap a range in the current file, show mappings"); + mmap_cmd.help = mmap_help; + +- mread_cmd.name = _("mread"); +- mread_cmd.altname = _("mr"); ++ mread_cmd.name = "mread"; ++ mread_cmd.altname = "mr"; + mread_cmd.cfunc = mread_f; + mread_cmd.argmin = 0; + mread_cmd.argmax = -1; +@@ -599,8 +599,8 @@ mmap_init(void) + _("reads data from a region in the current memory mapping"); + mread_cmd.help = mread_help; + +- msync_cmd.name = _("msync"); +- msync_cmd.altname = _("ms"); ++ msync_cmd.name = "msync"; ++ msync_cmd.altname = "ms"; + msync_cmd.cfunc = msync_f; + msync_cmd.argmin = 0; + msync_cmd.argmax = -1; +@@ -609,16 +609,16 @@ mmap_init(void) + msync_cmd.oneline = _("flush a region in the current memory mapping"); + msync_cmd.help = msync_help; + +- munmap_cmd.name = _("munmap"); +- munmap_cmd.altname = _("mu"); ++ munmap_cmd.name = "munmap"; ++ munmap_cmd.altname = "mu"; + munmap_cmd.cfunc = munmap_f; + munmap_cmd.argmin = 0; + munmap_cmd.argmax = 0; + munmap_cmd.flags = CMD_NOFILE_OK | CMD_FOREIGN_OK; + munmap_cmd.oneline = _("unmaps the current memory mapping"); + +- mwrite_cmd.name = _("mwrite"); +- mwrite_cmd.altname = _("mw"); ++ mwrite_cmd.name = "mwrite"; ++ mwrite_cmd.altname = "mw"; + mwrite_cmd.cfunc = mwrite_f; + mwrite_cmd.argmin = 0; + mwrite_cmd.argmax = -1; +diff --git a/io/open.c b/io/open.c +index 64c12ad..f1a6501 100644 +--- a/io/open.c ++++ b/io/open.c +@@ -772,8 +772,8 @@ statfs_f( + void + open_init(void) + { +- open_cmd.name = _("open"); +- open_cmd.altname = _("o"); ++ open_cmd.name = "open"; ++ open_cmd.altname = "o"; + open_cmd.cfunc = open_f; + open_cmd.argmin = 0; + open_cmd.argmax = -1; +@@ -782,7 +782,7 @@ open_init(void) + open_cmd.oneline = _("open the file specified by path"); + open_cmd.help = open_help; + +- stat_cmd.name = _("stat"); ++ stat_cmd.name = "stat"; + stat_cmd.cfunc = stat_f; + stat_cmd.argmin = 0; + stat_cmd.argmax = 1; +@@ -790,28 +790,28 @@ open_init(void) + stat_cmd.args = _("[-v]"); + stat_cmd.oneline = _("statistics on the currently open file"); + +- close_cmd.name = _("close"); +- close_cmd.altname = _("c"); ++ close_cmd.name = "close"; ++ close_cmd.altname = "c"; + close_cmd.cfunc = close_f; + close_cmd.argmin = 0; + close_cmd.argmax = 0; + close_cmd.flags = CMD_NOMAP_OK | CMD_FOREIGN_OK; + close_cmd.oneline = _("close the current open file"); + +- setfl_cmd.name = _("setfl"); ++ setfl_cmd.name = "setfl"; + setfl_cmd.cfunc = setfl_f; + setfl_cmd.args = _("[-adx]"); + setfl_cmd.flags = CMD_NOMAP_OK | CMD_FOREIGN_OK; + setfl_cmd.oneline = + _("set/clear append/direct flags on the open file"); + +- statfs_cmd.name = _("statfs"); ++ statfs_cmd.name = "statfs"; + statfs_cmd.cfunc = statfs_f; + statfs_cmd.flags = CMD_NOMAP_OK | CMD_FOREIGN_OK; + statfs_cmd.oneline = + _("statistics on the filesystem of the currently open file"); + +- chproj_cmd.name = _("chproj"); ++ chproj_cmd.name = "chproj"; + chproj_cmd.cfunc = chproj_f; + chproj_cmd.args = _("[-D | -R] projid"); + chproj_cmd.argmin = 1; +@@ -821,7 +821,7 @@ open_init(void) + _("change project identifier on the currently open file"); + chproj_cmd.help = chproj_help; + +- lsproj_cmd.name = _("lsproj"); ++ lsproj_cmd.name = "lsproj"; + lsproj_cmd.cfunc = lsproj_f; + lsproj_cmd.args = _("[-D | -R]"); + lsproj_cmd.argmin = 0; +@@ -831,7 +831,7 @@ open_init(void) + _("list project identifier set on the currently open file"); + lsproj_cmd.help = lsproj_help; + +- extsize_cmd.name = _("extsize"); ++ extsize_cmd.name = "extsize"; + extsize_cmd.cfunc = extsize_f; + extsize_cmd.args = _("[-D | -R] [extsize]"); + extsize_cmd.argmin = 0; +diff --git a/io/parent.c b/io/parent.c +index ea2efa8..3e93c22 100644 +--- a/io/parent.c ++++ b/io/parent.c +@@ -429,7 +429,7 @@ parent_help(void) + void + parent_init(void) + { +- parent_cmd.name = _("parent"); ++ parent_cmd.name = "parent"; + parent_cmd.cfunc = parent_f; + parent_cmd.argmin = 0; + parent_cmd.argmax = -1; +diff --git a/io/pread.c b/io/pread.c +index f8b378c..705dc69 100644 +--- a/io/pread.c ++++ b/io/pread.c +@@ -387,8 +387,8 @@ pread_f( + void + pread_init(void) + { +- pread_cmd.name = _("pread"); +- pread_cmd.altname = _("r"); ++ pread_cmd.name = "pread"; ++ pread_cmd.altname = "r"; + pread_cmd.cfunc = pread_f; + pread_cmd.argmin = 2; + pread_cmd.argmax = -1; +diff --git a/io/prealloc.c b/io/prealloc.c +index 2cf2172..8380646 100644 +--- a/io/prealloc.c ++++ b/io/prealloc.c +@@ -208,7 +208,7 @@ fpunch_f( + void + prealloc_init(void) + { +- allocsp_cmd.name = _("allocsp"); ++ allocsp_cmd.name = "allocsp"; + allocsp_cmd.cfunc = allocsp_f; + allocsp_cmd.argmin = 2; + allocsp_cmd.argmax = 2; +@@ -216,7 +216,7 @@ prealloc_init(void) + allocsp_cmd.args = _("off len"); + allocsp_cmd.oneline = _("allocates zeroed space for part of a file"); + +- freesp_cmd.name = _("freesp"); ++ freesp_cmd.name = "freesp"; + freesp_cmd.cfunc = freesp_f; + freesp_cmd.argmin = 2; + freesp_cmd.argmax = 2; +@@ -224,7 +224,7 @@ prealloc_init(void) + freesp_cmd.args = _("off len"); + freesp_cmd.oneline = _("frees space associated with part of a file"); + +- resvsp_cmd.name = _("resvsp"); ++ resvsp_cmd.name = "resvsp"; + resvsp_cmd.cfunc = resvsp_f; + resvsp_cmd.argmin = 2; + resvsp_cmd.argmax = 2; +@@ -233,7 +233,7 @@ prealloc_init(void) + resvsp_cmd.oneline = + _("reserves space associated with part of a file"); + +- unresvsp_cmd.name = _("unresvsp"); ++ unresvsp_cmd.name = "unresvsp"; + unresvsp_cmd.cfunc = unresvsp_f; + unresvsp_cmd.argmin = 2; + unresvsp_cmd.argmax = 2; +@@ -242,7 +242,7 @@ prealloc_init(void) + unresvsp_cmd.oneline = + _("frees reserved space associated with part of a file"); + +- zero_cmd.name = _("zero"); ++ zero_cmd.name = "zero"; + zero_cmd.cfunc = zero_f; + zero_cmd.argmin = 2; + zero_cmd.argmax = 2; +@@ -258,7 +258,7 @@ prealloc_init(void) + add_command(&zero_cmd); + + #if defined (HAVE_FALLOCATE) +- falloc_cmd.name = _("falloc"); ++ falloc_cmd.name = "falloc"; + falloc_cmd.cfunc = fallocate_f; + falloc_cmd.argmin = 2; + falloc_cmd.argmax = -1; +@@ -268,7 +268,7 @@ prealloc_init(void) + _("allocates space associated with part of a file via fallocate"); + add_command(&falloc_cmd); + +- fpunch_cmd.name = _("fpunch"); ++ fpunch_cmd.name = "fpunch"; + fpunch_cmd.cfunc = fpunch_f; + fpunch_cmd.argmin = 2; + fpunch_cmd.argmax = 2; +diff --git a/io/pwrite.c b/io/pwrite.c +index 26a7850..7c3932c 100644 +--- a/io/pwrite.c ++++ b/io/pwrite.c +@@ -349,8 +349,8 @@ done: + void + pwrite_init(void) + { +- pwrite_cmd.name = _("pwrite"); +- pwrite_cmd.altname = _("w"); ++ pwrite_cmd.name = "pwrite"; ++ pwrite_cmd.altname = "w"; + pwrite_cmd.cfunc = pwrite_f; + pwrite_cmd.argmin = 2; + pwrite_cmd.argmax = -1; +diff --git a/io/resblks.c b/io/resblks.c +index face175..2e54776 100644 +--- a/io/resblks.c ++++ b/io/resblks.c +@@ -58,7 +58,7 @@ resblks_f( + void + resblks_init(void) + { +- resblks_cmd.name = _("resblks"); ++ resblks_cmd.name = "resblks"; + resblks_cmd.cfunc = resblks_f; + resblks_cmd.argmin = 0; + resblks_cmd.argmax = 1; +diff --git a/io/sendfile.c b/io/sendfile.c +index 4b34a5f..426b75d 100644 +--- a/io/sendfile.c ++++ b/io/sendfile.c +@@ -176,8 +176,8 @@ done: + void + sendfile_init(void) + { +- sendfile_cmd.name = _("sendfile"); +- sendfile_cmd.altname = _("send"); ++ sendfile_cmd.name = "sendfile"; ++ sendfile_cmd.altname = "send"; + sendfile_cmd.cfunc = sendfile_f; + sendfile_cmd.argmin = 2; + sendfile_cmd.argmax = -1; +diff --git a/io/shutdown.c b/io/shutdown.c +index cf306fb..21e1626 100644 +--- a/io/shutdown.c ++++ b/io/shutdown.c +@@ -51,7 +51,7 @@ shutdown_f( + void + shutdown_init(void) + { +- shutdown_cmd.name = _("shutdown"); ++ shutdown_cmd.name = "shutdown"; + shutdown_cmd.cfunc = shutdown_f; + shutdown_cmd.argmin = 0; + shutdown_cmd.argmax = 1; +diff --git a/io/truncate.c b/io/truncate.c +index e7638da..49ced6f 100644 +--- a/io/truncate.c ++++ b/io/truncate.c +@@ -49,8 +49,8 @@ truncate_f( + void + truncate_init(void) + { +- truncate_cmd.name = _("truncate"); +- truncate_cmd.altname = _("t"); ++ truncate_cmd.name = "truncate"; ++ truncate_cmd.altname = "t"; + truncate_cmd.cfunc = truncate_f; + truncate_cmd.argmin = 1; + truncate_cmd.argmax = 1; +diff --git a/libxcmd/help.c b/libxcmd/help.c +index 2e567b6..54d34d8 100644 +--- a/libxcmd/help.c ++++ b/libxcmd/help.c +@@ -83,8 +83,8 @@ help_oneline( + void + help_init(void) + { +- help_cmd.name = _("help"); +- help_cmd.altname = _("?"); ++ help_cmd.name = "help"; ++ help_cmd.altname = "?"; + help_cmd.cfunc = help_f; + help_cmd.argmin = 0; <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfsprogs/xfsprogs.spec?r1=1.139&r2=1.140&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
