rpms/autofs/F-7 autofs-5.0.1-consistent-random-selection-option-name.patch, NONE, 1.1 autofs.spec, 1.214, 1.215

[Ian Kent (iankent)]

Author: iankent

Update of /cvs/pkgs/rpms/autofs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31148

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-consistent-random-selection-option-name.patch 
Log Message:
* Tue Aug 21 2007 Ian Kent <ikent at redhat.com> - 5.0.1-25
- change random multiple server selection option name to be consistent with upstream naming.


autofs-5.0.1-consistent-random-selection-option-name.patch:

--- NEW FILE autofs-5.0.1-consistent-random-selection-option-name.patch ---
--- autofs-5.0.1/daemon/automount.c.consistent-random-selection-option-name	2007-08-21 12:44:38.000000000 +0800
+++ autofs-5.0.1/daemon/automount.c	2007-08-21 12:45:31.000000000 +0800
@@ -1370,9 +1370,9 @@ 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"
+		"	-r --random-multimount-selection\n"
 		"			use ramdom replicated server selection\n"
-		"	-O --global-options"
+		"	-O --global-options\n"
 		"			specify global mount options\n"
 		"	-V --version	print version, build config and exit\n"
 		, program);
@@ -1472,7 +1472,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}
--- autofs-5.0.1/man/automount.8.in.consistent-random-selection-option-name	2007-08-21 12:44:38.000000000 +0800
+++ autofs-5.0.1/man/automount.8.in	2007-08-21 12:45:09.000000000 +0800
@@ -49,7 +49,7 @@ Define a global macro substitution varia
 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


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/F-7/autofs.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- autofs.spec	21 Aug 2007 04:07:07 -0000	1.214
+++ autofs.spec	21 Aug 2007 04:49:42 -0000	1.215
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.1
-Release: 24
+Release: 25
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
@@ -41,6 +41,7 @@
 Patch29: autofs-5.0.2-dont-fail-on-empty-master.patch
 Patch30: autofs-5.0.1-allow-ldap-star-wild.patch
 Patch31: autofs-5.0.2-ldap-percent-hack.patch
+Patch32: autofs-5.0.1-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
@@ -113,6 +114,7 @@
 %patch29 -p1
 %patch30 -p1
 %patch31 -p1
+%patch32 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -165,7 +167,11 @@
 %{_libdir}/autofs/
 
 %changelog
-* Tue Aug 21 2007 Ian Kent <ikent at redhat.com> - 5.0.2-24
+* Tue Aug 21 2007 Ian Kent <ikent at redhat.com> - 5.0.1-25
+- change random multiple server selection option name to be consistent
+  with upstream naming.
+
+* Tue Aug 21 2007 Ian Kent <ikent at redhat.com> - 5.0.1-24
 - don't fail on empty master map.
 - allow for older schemas that allow "*" as a key value.
 - add support for the "%" hack for case insensitive attribute schemas.