From 3df55b8557bbb38e1841a4200ab5d3146d43d5e6 Mon Sep 17 00:00:00 2001
From: Ian Kent <iankent@fedoraproject.org>
Date: Tue, 21 Aug 2007 04:20:57 +0000
Subject: [PATCH] - change random multiple server selection option name to be
 consistent with     upstream naming.

---
 ...sistent-random-selection-option-name.patch | 35 +++++++++++++++++++
 autofs.spec                                   | 10 ++++--
 2 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 autofs-5.0.2-consistent-random-selection-option-name.patch

diff --git a/autofs-5.0.2-consistent-random-selection-option-name.patch b/autofs-5.0.2-consistent-random-selection-option-name.patch
new file mode 100644
index 0000000..d3a602b
--- /dev/null
+++ b/autofs-5.0.2-consistent-random-selection-option-name.patch
@@ -0,0 +1,35 @@
+diff --git a/daemon/automount.c b/daemon/automount.c
+index 3e40428..294c511 100644
+--- a/daemon/automount.c
++++ b/daemon/automount.c
+@@ -1367,7 +1367,7 @@ static void usage(void)
+ 		"	-d --debug	log debuging info\n"
+ 		"	-D --define	define global macro variable\n"
+ 		/*"	-f --foreground do not fork into background\n" */
+-		"	-r --random-replicated-selection\n"
++		"	-r --random-multimount-selection\n"
+ 		"			use ramdom replicated server selection\n"
+ 		"	-O --global-options\n"
+ 		"			specify global mount options\n"
+@@ -1469,7 +1469,7 @@ int main(int argc, char *argv[])
+ 		{"debug", 0, 0, 'd'},
+ 		{"define", 1, 0, 'D'},
+ 		{"foreground", 0, 0, 'f'},
+-		{"random-selection", 0, 0, 'r'},
++		{"random-multimount-selection", 0, 0, 'r'},
+ 		{"global-options", 1, 0, 'O'},
+ 		{"version", 0, 0, 'V'},
+ 		{0, 0, 0, 0}
+diff --git a/man/automount.8 b/man/automount.8
+index b01be83..fc1846a 100644
+--- a/man/automount.8
++++ b/man/automount.8
+@@ -47,7 +47,7 @@ Define a global macro substitution variable. Global definitions
+ are over-ridden macro definitions of the same name specified in
+ mount entries.
+ .TP
+-.I "\-r, \-\-random-replicated-selection"
++.I "\-r, \-\-random-multimount-selection"
+ Enables the use of ramdom selection when choosing a host from a
+ list of replicated servers.
+ .TP
diff --git a/autofs.spec b/autofs.spec
index 85f5298..2127883 100644
--- a/autofs.spec
+++ b/autofs.spec
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.2
-Release: 11
+Release: 12
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
@@ -24,6 +24,7 @@ Patch10: autofs-5.0.2-fix-largefile-dumbness.patch
 Patch11: autofs-5.0.2-instance-stale-mark.patch
 Patch12: autofs-5.0.2-dont-fail-on-empty-master.patch
 Patch13: autofs-5.0.2-ldap-percent-hack.patch
+Patch14: autofs-5.0.2-consistent-random-selection-option-name.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Conflicts: kernel < 2.6.17
@@ -79,6 +80,7 @@ echo %{version}-%{release} > .version
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -131,7 +133,11 @@ fi
 %{_libdir}/autofs/
 
 %changelog
-* Mon Aug 21 2007 Ian Kent <ikent@redhat.com> - 5.0.2-11
+* Tue Aug 21 2007 Ian Kent <ikent@redhat.com> - 5.0.2-12
+- change random multiple server selection option name to be consistent
+  with upstream naming.
+
+* Tue Aug 21 2007 Ian Kent <ikent@redhat.com> - 5.0.2-11
 - don't fail on empty master map.
 - add support for the "%" hack for case insensitive attribute schemas.