rpms/autofs/devel autofs-4.1.4-init-browse-as-non-first-option.patch, 1.1, 1.2 autofs.spec, 1.60, 1.61

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2028

Modified Files:
	autofs-4.1.4-init-browse-as-non-first-option.patch autofs.spec 
Log Message:
* Fri Apr 15 2005 Chris Feist <cfeist at redhat.com> - 1:4.1.4-5
- Fixed regression with -browse not taking effect.



autofs-4.1.4-init-browse-as-non-first-option.patch:
 rc.autofs.in |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

Index: autofs-4.1.4-init-browse-as-non-first-option.patch
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs-4.1.4-init-browse-as-non-first-option.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- autofs-4.1.4-init-browse-as-non-first-option.patch	13 Apr 2005 23:34:44 -0000	1.1
+++ autofs-4.1.4-init-browse-as-non-first-option.patch	15 Apr 2005 18:37:11 -0000	1.2
@@ -8,7 +8,7 @@
 +		if echo "$options" | grep -q 'browse' ;
  		then
 -		    startupoptions="$startupoptions --ghost"
-+		    if echo "$options" | grep -qE -- '[ 	]+-browse' ||
++		    if echo "$options" | grep -qE -- '\B-browse\b' ||
 +		       echo "$options" | grep -q -- ',browse' ;
 +		    then
 +			startupoptions="$startupoptions --ghost"


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- autofs.spec	14 Apr 2005 02:30:56 -0000	1.60
+++ autofs.spec	15 Apr 2005 18:37:11 -0000	1.61
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 4.1.4
-%define release 4
+%define release 5
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -121,6 +121,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Fri Apr 15 2005 Chris Feist <cfeist at redhat.com> - 1:4.1.4-5
+- Fixed regression with -browse not taking effect.
+
 * Wed Apr 13 2005 Jeff Moyer <jmoyer at redhat.com> - 1:4.1.4-4
 - Finish up with the merge breakage.
 - Temporary fix for the multimount detection code.  It seems half-baked.