From 010422607ecdad670ebf13b9d22ece2113227c52 Mon Sep 17 00:00:00 2001 From: Petr Písař Date: Feb 02 2011 15:13:24 +0000 Subject: Correct manual pages Mainly about prepending slash in NFSv4 and then all dependecies changes. --- diff --git a/quota-4.00_pre1-Added-reference-to-setquota-to-quota-1-manpage.patch b/quota-4.00_pre1-Added-reference-to-setquota-to-quota-1-manpage.patch new file mode 100644 index 0000000..16a64b6 --- /dev/null +++ b/quota-4.00_pre1-Added-reference-to-setquota-to-quota-1-manpage.patch @@ -0,0 +1,35 @@ +From f323a983893484104a3a981134cd8c3c75b9dd4d Mon Sep 17 00:00:00 2001 +From: jkar8572 +Date: Thu, 2 Sep 2010 15:00:14 +0000 +Subject: [PATCH] Added reference to setquota to quota(1) manpage. Fixed description of -m option + of edquota (Jan Kara) + +Petr Pisar: Changelog entry removed. + +diff --git a/edquota.8 b/edquota.8 +index 7ade64a..d31d994 100644 +--- a/edquota.8 ++++ b/edquota.8 +@@ -100,7 +100,7 @@ Currently, pathnames of NFSv4 mountpoints are sent without leading slash in the + .BR rpc.rquotad + uses this to recognize NFSv4 mounts and properly prepend pseudoroot of NFS filesystem + to the path. If you specify this option, +-.BR setquota ++.BR edquota + will always send paths with a trailing slash. This can be useful for legacy reasons but + be aware that quota over RPC will stop working if you are using new + .BR rpc.rquotad . +diff --git a/quota.1 b/quota.1 +index 9d6a0a1..11f3da1 100644 +--- a/quota.1 ++++ b/quota.1 +@@ -190,4 +190,5 @@ default filesystems + .BR quotaon (8), + .BR quota_nld (8), + .BR repquota (8), +-.BR warnquota (8) ++.BR warnquota (8), ++.BR setquota (8) +-- +1.7.4 + diff --git a/quota-4.00_pre1-Correct-no-mixed-pathnames-documentation.patch b/quota-4.00_pre1-Correct-no-mixed-pathnames-documentation.patch new file mode 100644 index 0000000..9d7fb4f --- /dev/null +++ b/quota-4.00_pre1-Correct-no-mixed-pathnames-documentation.patch @@ -0,0 +1,57 @@ +From 2bbd79d4eb6b712f80364ddd9e3549de30529674 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Wed, 12 Jan 2011 16:30:53 +0100 +Subject: [PATCH] Correct --no-mixed-pathnames documentation + +This option controls a leading slash, not a trailing one. +The quota(1) page talks about quota, not about setquota. +--- + edquota.8 | 2 +- + quota.1 | 4 ++-- + setquota.8 | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/edquota.8 b/edquota.8 +index 9b7ffd4..4b1406b 100644 +--- a/edquota.8 ++++ b/edquota.8 +@@ -101,7 +101,7 @@ Currently, pathnames of NFSv4 mountpoints are sent without leading slash in the + uses this to recognize NFSv4 mounts and properly prepend pseudoroot of NFS filesystem + to the path. If you specify this option, + .BR edquota +-will always send paths with a trailing slash. This can be useful for legacy reasons but ++will always send paths with a leading slash. This can be useful for legacy reasons but + be aware that quota over RPC will stop working if you are using new + .BR rpc.rquotad . + .TP +diff --git a/quota.1 b/quota.1 +index 11865af..7a62764 100644 +--- a/quota.1 ++++ b/quota.1 +@@ -123,8 +123,8 @@ Currently, pathnames of NFSv4 mountpoints are sent without leading slash in the + .BR rpc.rquotad + uses this to recognize NFSv4 mounts and properly prepend pseudoroot of NFS filesystem + to the path. If you specify this option, +-.BR setquota +-will always send paths with a trailing slash. This can be useful for legacy reasons but ++.BR quota ++will always send paths with a leading slash. This can be useful for legacy reasons but + be aware that quota over RPC will stop working if you are using new + .BR rpc.rquotad . + .TP +diff --git a/setquota.8 b/setquota.8 +index c7fe408..472279d 100644 +--- a/setquota.8 ++++ b/setquota.8 +@@ -126,7 +126,7 @@ Currently, pathnames of NFSv4 mountpoints are sent without leading slash in the + uses this to recognize NFSv4 mounts and properly prepend pseudoroot of NFS filesystem + to the path. If you specify this option, + .BR setquota +-will always send paths with a trailing slash. This can be useful for legacy reasons but ++will always send paths with a leading slash. This can be useful for legacy reasons but + be aware that quota over RPC will stop working if you are using new + .BR rpc.rquotad . + .TP +-- +1.7.3.4 + diff --git a/quota-4.00_pre1-fixup-typos-in-manpages.patch b/quota-4.00_pre1-fixup-typos-in-manpages.patch new file mode 100644 index 0000000..32c2096 --- /dev/null +++ b/quota-4.00_pre1-fixup-typos-in-manpages.patch @@ -0,0 +1,48 @@ +From e705c30d5f3758893eaa54be6867f5b6c50b8e24 Mon Sep 17 00:00:00 2001 +From: jkar8572 +Date: Mon, 22 Feb 2010 20:43:59 +0000 +Subject: [PATCH] * fixup typos in manpages (Michael Meskes) + +--- + Changelog | 3 +++ + quota.1 | 2 +- + quotacheck.8 | 2 +- + 3 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/Changelog b/Changelog +index c2931a6..6fcb056 100644 +--- a/Changelog ++++ b/Changelog +@@ -1,3 +1,6 @@ ++Changes in quota-tools from 3.17 to 4.00-pre2 ++* fixup typos in manpages (Michael Meskes) ++ + Changes in quota-tools from 3.17 to 4.00-pre1 + * don't try to set inode flags when getting them failed (Michalski Wojciech) + * added liblber to the list of libraries needed for LDAP support (Michael Meskes) +diff --git a/quota.1 b/quota.1 +index 705629c..0dd79a4 100644 +--- a/quota.1 ++++ b/quota.1 +@@ -187,4 +187,4 @@ default filesystems + .BR quotaon (8), + .BR quota_nld (8), + .BR repquota (8), +-.DR warnquota (8) ++.BR warnquota (8) +diff --git a/quotacheck.8 b/quotacheck.8 +index ed23e73..fe020f4 100644 +--- a/quotacheck.8 ++++ b/quotacheck.8 +@@ -17,7 +17,7 @@ quotacheck \- scan a filesystem for disk usage, create, check and repair quota f + .B quotacheck + examines each filesystem, builds a table of current disk usage, and + compares this table against that recorded in the disk quota file for the +-filesystem (this step is ommitted if option ++filesystem (this step is omitted if option + .B -c + is specified). If any inconsistencies are detected, both the quota file + and the current system copy of the incorrect quotas are updated (the +-- +1.7.4 + diff --git a/quota.spec b/quota.spec index 3a9865c..84b12eb 100644 --- a/quota.spec +++ b/quota.spec @@ -5,7 +5,7 @@ Name: quota Summary: System administration tools for monitoring users' disk usage Epoch: 1 Version: 4.00 -Release: 0.4.pre1%{?dist} +Release: 0.5.pre1%{?dist} License: BSD and GPLv2+ URL: http://sourceforge.net/projects/linuxquota/ Group: System Environment/Base @@ -46,6 +46,12 @@ Patch13: quota-4.00_pre1-Make-RPC-block-factor-dynamic.patch Patch14: quota-4.00_pre1-Check-whether-set-limits-fit-into-the-range-supporte.patch # Bug #668691 Patch15: quota-4.00_pre1-Check-set-limits-fit-into-the-range-supported-by-RPC.patch +# In upstream 4.00_pre2 +Patch16: quota-4.00_pre1-fixup-typos-in-manpages.patch +# In upstream 4.00_pre2 +Patch17: quota-4.00_pre1-Added-reference-to-setquota-to-quota-1-manpage.patch +# In upstream 4.00_pre2 +Patch18: quota-4.00_pre1-Correct-no-mixed-pathnames-documentation.patch %description The quota package contains system administration tools for monitoring @@ -131,6 +137,9 @@ Linux/UNIX environment. %patch13 -p1 -b .rpc_block_factor_dynamic %patch14 -p1 -b .check_set_limits %patch15 -p1 -b .check_set_limits_rpc +%patch16 -p1 -b .typos_in_manpages +%patch17 -p1 -b .reference_to_setquota_doc +%patch18 -p1 -b .mixed_pathnames_doc # quotactl(2) moved into `man-pages' package (bug #640590) rm -f quotactl.2 # remove VCS files @@ -253,6 +262,9 @@ rm -rf %{buildroot} %changelog +* Wed Feb 02 2011 Petr Pisar - 1:4.00-0.5.pre1 +- Correct manual pages + * Tue Jan 11 2011 Petr Pisar - 1:4.00-0.4.pre1 - Make RPC block factor dynamic (bug #667757) - Check whether set limits fit into the range supported by quota format