rpms/quota/F-8 quota-3.14-helpoption.patch, NONE, 1.1 quota-3.14-manpages.patch, NONE, 1.1 quota.spec, 1.33, 1.34

[Ondrej Vasik (ovasik)]

Author: ovasik

Update of /cvs/extras/rpms/quota/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25255

Modified Files:
	quota.spec 
Added Files:
	quota-3.14-helpoption.patch quota-3.14-manpages.patch 
Log Message:
various cosmetic fixes from F-9, see changelog for details

quota-3.14-helpoption.patch:

--- NEW FILE quota-3.14-helpoption.patch ---
diff -urNp quota-tools-orig/edquota.c quota-tools/edquota.c
--- quota-tools-orig/edquota.c	2006-10-30 16:26:20.000000000 +0100
+++ quota-tools/edquota.c	2008-08-05 14:19:02.000000000 +0200
@@ -127,9 +127,9 @@ int parse_options(int argc, char **argv)
 
 	quotatype = USRQUOTA;
 #if defined(RPC_SETQUOTA)
-	while ((ret = getopt_long(argc, argv, "ugrntTVp:F:f:", long_opts, NULL)) != -1) {
+	while ((ret = getopt_long(argc, argv, "ughrntTVp:F:f:", long_opts, NULL)) != -1) {
 #else
-	while ((ret = getopt_long(argc, argv, "ugtTVp:F:f:", long_opts, NULL)) != -1) {
+	while ((ret = getopt_long(argc, argv, "ughtTVp:F:f:", long_opts, NULL)) != -1) {
 #endif
 		switch (ret) {
 		  case 'p':
@@ -166,6 +166,7 @@ int parse_options(int argc, char **argv)
 		  case 'V':
 			  version();
 			  exit(0);
+		  case 'h':
 		  default:
 			  usage();
 		}
diff -urNp quota-tools-orig/quota.c quota-tools/quota.c
--- quota-tools-orig/quota.c	2007-06-20 18:22:23.000000000 +0200
+++ quota-tools/quota.c	2008-08-05 14:18:22.000000000 +0200
@@ -263,7 +263,7 @@ int main(int argc, char **argv)
 	gettexton();
 	progname = basename(argv[0]);
 
-	while ((ret = getopt_long(argc, argv, "guqvsVliQF:wf", long_opts, NULL)) != -1) {
+	while ((ret = getopt_long(argc, argv, "ghuqvsVliQF:wf", long_opts, NULL)) != -1) {
 		switch (ret) {
 		  case 'g':
 			  flags |= FL_GROUP;
@@ -311,6 +311,7 @@ int main(int argc, char **argv)
 		  case 'V':
 			  version();
 			  exit(0);
+		  case 'h':
 		  default:
 			  usage();
 		}
diff -urNp quota-tools-orig/setquota.c quota-tools/setquota.c
--- quota-tools-orig/setquota.c	2006-05-13 03:05:24.000000000 +0200
+++ quota-tools/setquota.c	2008-08-05 14:19:52.000000000 +0200
@@ -102,9 +102,9 @@ static void parse_options(int argcnt, ch
 	char *protoname = NULL;
 
 #ifdef RPC_SETQUOTA
-	char *opts = "gp:urVF:taTb";
+	char *opts = "ghp:urVF:taTb";
 #else
-	char *opts = "gp:uVF:taTb";
+	char *opts = "ghp:uVF:taTb";
 #endif
 	struct option long_opts[] = {
 		{ "user", 0, NULL, 'u' },

quota-3.14-manpages.patch:

--- NEW FILE quota-3.14-manpages.patch ---
diff -urNp quota-tools-orig/quotaon.8 quota-tools/quotaon.8
--- quota-tools-orig/quotaon.8	2008-08-05 15:01:48.000000000 +0200
+++ quota-tools/quotaon.8	2008-08-05 15:38:05.000000000 +0200
@@ -197,4 +197,5 @@ default filesystems
 .SH "SEE ALSO"
 .BR quotactl (2),
 .BR fstab (5),
-.BR repquota (8).
+.BR repquota (8),
+.BR warnquota (8).
diff -urNp quota-tools-orig/quota.1 quota-tools/quota.1
--- quota-tools-orig/quota.1	2006-07-21 16:44:12.000000000 +0200
+++ quota-tools/quota.1	2008-08-05 15:38:35.000000000 +0200
@@ -140,4 +140,5 @@ default filesystems
 .BR edquota (8),
 .BR quotacheck (8),
 .BR quotaon (8),
-.BR repquota (8)
+.BR repquota (8),
+.BR warnquota (8).
diff -urNp quota-tools-orig/repquota.8 quota-tools/repquota.8
--- quota-tools-orig/repquota.8	2006-07-21 16:44:12.000000000 +0200
+++ quota-tools/repquota.8	2008-08-05 15:39:08.000000000 +0200
@@ -139,4 +139,5 @@ default set of groups
 .BR edquota (8),
 .BR quotacheck (8),
 .BR quotaon (8),
-.BR setquota (8)
+.BR setquota (8),
+.BR warnquota (8).
diff -urNp quota-tools-orig/warnquota.8 quota-tools/warnquota.8
--- quota-tools-orig/warnquota.8	2006-07-21 16:44:12.000000000 +0200
+++ quota-tools/warnquota.8	2008-08-05 15:39:40.000000000 +0200
@@ -20,7 +20,7 @@ warnquota \- send mail to users over quo
 ]
 .SH DESCRIPTION
 .B warnquota
-checks the disk quota for each filesystem and mails a warning
+checks the disk quota for each local filesystem and mails a warning
 message to those users who have reached their softlimit.
 It is typically run via
 .BR cron (8).


Index: quota.spec
===================================================================
RCS file: /cvs/extras/rpms/quota/F-8/quota.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- quota.spec	15 Feb 2007 22:42:06 -0000	1.33
+++ quota.spec	5 Aug 2008 14:00:45 -0000	1.34
@@ -2,7 +2,7 @@
 Summary: System administration tools for monitoring users' disk usage.
 Epoch: 1
 Version: 3.14
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 URL: http://sourceforge.net/projects/linuxquota/
 Group: System Environment/Base
@@ -16,6 +16,8 @@
 Patch2: quota-3.06-man-page.patch
 Patch3: quota-3.06-pie.patch
 Patch4: quota-3.13-wrong-ports.patch
+Patch5: quota-3.14-helpoption.patch
+Patch6: quota-3.14-manpages.patch
 
 
 %description
@@ -32,11 +34,13 @@
 %patch3 -p1
 %endif
 %patch4 -p1
-
+%patch5 -p1
+%patch6 -p1
 
 %build
 %configure \
-	--with-ext2direct=no --enable-rootsbin
+  --enable-ldapmail=try \
+	--enable-rootsbin
 make
 
 
@@ -55,6 +59,9 @@
 rm -f %{buildroot}%{_sbindir}/quot
 rm -f %{buildroot}%{_sbindir}/xqmstats
 rm -f %{buildroot}%{_mandir}/man8/quot.*
+rm -f %{buildroot}%{_mandir}/man8/xqmstats.*
+ln -s  %{_mandir}/man8/quotaon.8 \
+  %{buildroot}%{_mandir}/man8/quotaoff.8
 
 %find_lang %{name}
 
@@ -80,6 +87,17 @@
 
 
 %changelog
+* Tue Aug 05 2008  Ondrej Vasik <ovasik at redhat.com> 3.14-2
+- added enable-ldapmail=try configure option
+- dropped with-ext2direct=no option - this option is 
+  invalid and original bug was fixed in 3.07
+- Add support for -h option (do not show invalid option
+  error) at edquota,setquota and quota (#457898)
+- added symbolic link for quotaoff man page(#436110)
+- don't ship xqmstats.8 man page as we don't ship those
+  binaries(#436100)
+- added pointers to warnquota to some manpages
+
 * Thu Feb 15 2007  Steve Dickson <SteveD at RedHat.com> 3.14-1
 - Upgraded to version 3.14 (bz# 213641)