diff --git a/autofs-5.0.7-misc-man-page-fixes.patch b/autofs-5.0.7-misc-man-page-fixes.patch new file mode 100644 index 0000000..3e2e1a8 --- /dev/null +++ b/autofs-5.0.7-misc-man-page-fixes.patch @@ -0,0 +1,73 @@ +autofs-5.0.7 - misc man page fixes + +From: Ian Kent + +- add missing long option for for macro define in automount(8). +- fix a couple of grammar mistakes in autofs(8). +- add missing force option to help. +--- + CHANGELOG | 1 + + daemon/automount.c | 1 + + man/autofs.8.in | 4 ++-- + man/automount.8 | 2 +- + 4 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/CHANGELOG b/CHANGELOG +index 0242c11..503a21e 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -51,6 +51,7 @@ + - probe each nfs version in turn for singleton mounts. + - add changlog entry for coverity fixes. + - fix probe each nfs version in turn for singleton mounts. ++- misc man page fixes. + + 25/07/2012 autofs-5.0.7 + ======================= +diff --git a/daemon/automount.c b/daemon/automount.c +index 3f9337f..019637f 100644 +--- a/daemon/automount.c ++++ b/daemon/automount.c +@@ -1734,6 +1734,7 @@ static void usage(void) + " set daemon log verbosity\n" + " -C --dont-check-daemon\n" + " don't check if daemon is already running\n" ++ " -F --force forceably clean up known automounts at start\n" + " -V --version print version, build config and exit\n" + , program); + } +diff --git a/man/autofs.8.in b/man/autofs.8.in +index ac0670d..fae0b00 100644 +--- a/man/autofs.8.in ++++ b/man/autofs.8.in +@@ -6,7 +6,7 @@ + .I start|stop|restart|reload|status + .SH "DESCRIPTION" + .B autofs +-control the operation of the ++controls the operation of the + .BR automount (8) + daemons running on the Linux system. Usually + .B autofs +@@ -16,7 +16,7 @@ parameter and at shutdown time with the + .I stop + parameter. The + .B autofs +-script can also manually be invoked by the system administrator to shut ++script can also be manually invoked by the system administrator to shut + down, restart or reload the automounters. + .P + .SH "OPERATION" +diff --git a/man/automount.8 b/man/automount.8 +index 7cc32c5..844b876 100644 +--- a/man/automount.8 ++++ b/man/automount.8 +@@ -45,7 +45,7 @@ autofs managed mounts. + Enables logging of general status and progress messages as well as + debugging messages for all autofs managed mounts. + .TP +-.I "\-Dvariable=value" ++.I "\-Dvariable=value, --define variable=value" + Define a global macro substitution variable. Global definitions + are over-ridden macro definitions of the same name specified in + mount entries. diff --git a/autofs.spec b/autofs.spec index 83b8c11..6c8aaf8 100644 --- a/autofs.spec +++ b/autofs.spec @@ -8,7 +8,7 @@ Summary: A tool for automatically mounting and unmounting filesystems Name: autofs Version: 5.0.7 -Release: 21%{?dist} +Release: 22%{?dist} Epoch: 1 License: GPLv2+ Group: System Environment/Daemons @@ -92,6 +92,7 @@ Patch76: autofs-5.0.7-fix-incorrect-check-in-flag_is_owned.patch Patch77: autofs-5.0.7-fix-possible-use-after-free-in-lookup_dir-lookup_init.patch Patch78: autofs-5.0.7-add-changlog-entry-for-coverity-fixes.patch Patch79: autofs-5.0.7-fix-probe-each-nfs-version-in-turn-for-singleton-mounts.patch +Patch80: autofs-5.0.7-misc-man-page-fixes.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if %{with_systemd} BuildRequires: systemd-units @@ -228,6 +229,7 @@ echo %{version}-%{release} > .version %patch77 -p1 %patch78 -p1 %patch79 -p1 +%patch80 -p1 %build #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir} @@ -319,6 +321,9 @@ fi %dir /etc/auto.master.d %changelog +* Wed Jun 19 2013 Ian Kent - 1:5.0.7-22 +- misc man page fixes (bz948517). + * Wed Jun 12 2013 Ian Kent - 1:5.0.7-21 - fix probe each nfs version in turn for singleton mounts (bz973537).