rpms/quota/devel quota-3.16-quotaoffhelp.patch, NONE, 1.1 quota.spec, 1.47, 1.48

[Ondrej Vasik]

Author: ovasik

Update of /cvs/extras/rpms/quota/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29627

Modified Files:
	quota.spec 
Added Files:
	quota-3.16-quotaoffhelp.patch 
Log Message:
fix quota --help output

quota-3.16-quotaoffhelp.patch:

--- NEW FILE quota-3.16-quotaoffhelp.patch ---
diff -urNp quota-tools-orig/quotaon.c quota-tools/quotaon.c
--- quota-tools-orig/quotaon.c	2008-03-13 15:49:33.000000000 +0100
+++ quota-tools/quotaon.c	2008-11-14 13:05:53.000000000 +0100
@@ -66,7 +66,7 @@ static void usage(void)
 {
 	errstr(_("Usage:\n\t%s [-guvp] [-F quotaformat] [-x state] -a\n\
 \t%s [-guvp] [-F quotaformat] [-x state] filesys ...\n\n\
--a, --all                turn quotas on for all filesystems\n\
+-a, --all                turn quotas %s for all filesystems\n\
 -f, --off                turn quotas off\n\
 -u, --user               operate on user quotas\n\
 -g, --group              operate on group quotas\n\
@@ -75,7 +75,8 @@ static void usage(void)
 -F, --format=formatname  operate on specific quota format\n\
 -v, --verbose            print more messages\n\
 -h, --help               display this help text and exit\n\
--V, --version            display version information and exit\n"), progname, progname);
+-V, --version            display version information and exit\n"),
+ progname, progname, strcmp (progname, "quotaon")?_("off"):_("on"));
 	exit(1);
 }
 


Index: quota.spec
===================================================================
RCS file: /cvs/extras/rpms/quota/devel/quota.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- quota.spec	30 Oct 2008 08:30:22 -0000	1.47
+++ quota.spec	14 Nov 2008 12:19:49 -0000	1.48
@@ -5,7 +5,7 @@
 Summary: System administration tools for monitoring users' disk usage
 Epoch: 1
 Version: 3.16
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD and GPLv2+
 URL: http://sourceforge.net/projects/linuxquota/
 Group: System Environment/Base
@@ -23,6 +23,7 @@
 Patch6: quota-3.16-helpoption.patch
 Patch7: quota-3.16-upstreampatches.patch
 Patch8: quota-3.16-ext4support.patch
+Patch9: quota-3.16-quotaoffhelp.patch
 
 %description
 The quota package contains system administration tools for monitoring
@@ -54,6 +55,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1 -b .ext4
+%patch9 -p1 -b .usage
 
 #fix typos/mistakes in localized documentation
 for pofile in $(find ./po/*.p*)
@@ -113,6 +115,9 @@
 %attr(0644,root,root) %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 14 2008 Ondrej Vasik <ovasik at redhat.com> 1:3.16-7
+- fix quotaoff --help output (was same as quotaon output)
+
 * Thu Oct 30 2008 Ondrej Vasik <ovasik at redhat.com> 1:3.16-6
 - fix implementation of ext4 support
   (by Mingming Cao, #469127)