From dcb7b7d868a74c13f6ae98b52a2979968f519f81 Mon Sep 17 00:00:00 2001
From: Ian Kent <raven@themaw.net>
Date: Dec 03 2012 07:35:23 +0000
Subject: - add timeout option description to man page (bz882550).


---

diff --git a/autofs-5.0.7-add-timeout-option-description-to-man-page.patch b/autofs-5.0.7-add-timeout-option-description-to-man-page.patch
new file mode 100644
index 0000000..3a56a0b
--- /dev/null
+++ b/autofs-5.0.7-add-timeout-option-description-to-man-page.patch
@@ -0,0 +1,38 @@
+autofs-5.0.7 - add timeout option description to man page
+
+From: Ian Kent <ikent@redhat.com>
+
+The pseudo option used t set the timeout for map entries is one of
+the most most frequently used autofs options but is not mentioned
+in auto.master(5).
+---
+
+ CHANGELOG            |    1 +
+ man/auto.master.5.in |    5 +++++
+ 2 files changed, 6 insertions(+)
+
+
+--- autofs-5.0.6.orig/CHANGELOG
++++ autofs-5.0.6/CHANGELOG
+@@ -45,6 +45,7 @@
+ - fix systemd argument passing.
+ - fix get_nfs_info() can incorrectly fail.
+ - fix nfs4 contacts portmap.
++- add timeout option description to man page.
+ 
+ 28/06/2011 autofs-5.0.6
+ -----------------------
+--- autofs-5.0.6.orig/man/auto.master.5.in
++++ autofs-5.0.6/man/auto.master.5.in
+@@ -167,6 +167,11 @@ server is specified in the map entry. If
+ then each available server will be tried in the order listed, within
+ proximity.
+ .TP
++.I "\-t, \-\-timeout <seconds>"
++Set the expire timeout for map entries. This option can be used to
++override the global default given either on the command line
++or in the configuration.
++.TP
+ .I "\-n, \-\-negative\-timeout <seconds>"
+ Set the timeout for caching failed key lookups. This option can be
+ used to override the global default given either on the command line
diff --git a/autofs.spec b/autofs.spec
index 264b78e..2f51ae7 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.6
-Release: 22%{?dist}
+Release: 23%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
@@ -62,6 +62,7 @@ Patch46: autofs-5.0.6-fix-libtirpc-name-clash.patch
 Patch47: autofs-5.0.6-fix-systemd-argument-passing.patch
 Patch48: autofs-5.0.6-fix-get_nfs_info-incorrectly-fails.patch
 Patch49: autofs-5.0.6-fix-nfs4-contacts-portmap.patch
+Patch50: autofs-5.0.7-add-timeout-option-description-to-man-page.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{with_systemd}
 BuildRequires: systemd-units
@@ -167,6 +168,7 @@ echo %{version}-%{release} > .version
 %patch47 -p1
 %patch48 -p1
 %patch49 -p1
+%patch50 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -269,6 +271,9 @@ fi
 %dir /etc/auto.master.d
 
 %changelog
+* Mon Dec 3 2012 Ian Kent <kent@redhat.com> - 1:5.0.6-23
+- add timeout option description to man page (bz882550).
+
 * Mon Aug 3 2012 Ian Kent <kent@redhat.com> - 1:5.0.6-22
 - fix nfs4 mount contacts portmap (bz845313).