rpms/nfs-utils/F-7 nfs-utils-1.1.0-mount-v4-errors.patch, 1.1, 1.2 nfs-utils.spec, 1.151, 1.152

[Steve Dickson (steved)]

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5697

Modified Files:
	nfs-utils-1.1.0-mount-v4-errors.patch nfs-utils.spec 
Log Message:
Fixed typo in nfs4-mount-errors patch


nfs-utils-1.1.0-mount-v4-errors.patch:

Index: nfs-utils-1.1.0-mount-v4-errors.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-7/nfs-utils-1.1.0-mount-v4-errors.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nfs-utils-1.1.0-mount-v4-errors.patch	16 Jul 2007 17:39:38 -0000	1.1
+++ nfs-utils-1.1.0-mount-v4-errors.patch	18 Jul 2007 20:39:02 -0000	1.2
@@ -1,6 +1,6 @@
---- nfs-utils-1.1.0/utils/mount/mount.c.orig	2007-07-16 13:07:23.000000000 -0400
-+++ nfs-utils-1.1.0/utils/mount/mount.c	2007-07-16 13:15:55.000000000 -0400
-@@ -286,7 +286,7 @@ static void parse_opts (const char *opti
+--- nfs-utils-1.1.0/utils/mount/mount.c.orig	2007-07-18 16:26:01.000000000 -0400
++++ nfs-utils-1.1.0/utils/mount/mount.c	2007-07-18 16:37:34.000000000 -0400
+@@ -286,17 +286,24 @@ static void parse_opts (const char *opti
  	}
  }
  
@@ -9,8 +9,14 @@
  {
  	switch(errno) {
  		case ENOTDIR:
-@@ -296,7 +296,11 @@ static void mount_error(char *node)
- 			fprintf(stderr, "%s: %s is already mounted or busy\n", progname, node);
+-			fprintf(stderr, "%s: mount point %s is not a directory\n", progname, node);
++			fprintf(stderr, "%s: mount point %s is not a directory\n", 
++				progname, mount_point);
+ 			break;
+ 		case EBUSY:
+-			fprintf(stderr, "%s: %s is already mounted or busy\n", progname, node);
++			fprintf(stderr, "%s: %s is already mounted or busy\n", progname, 
++				mount_point);
  			break;
  		case ENOENT:
 -			fprintf(stderr, "%s: mount point %s does not exist\n", progname, node);
@@ -18,11 +24,12 @@
 +				fprintf(stderr, "%s: %s failed, reason given by server: %s\n",
 +					progname, node, strerror(errno));
 +			else
-+				fprintf(stderr, "%s: mount point %s does not exist\n", progname, node);
++				fprintf(stderr, "%s: mount point %s does not exist\n", progname, 
++					mount_point);
  			break;
  		default:
  			fprintf(stderr, "%s: %s\n", progname, strerror(errno));
-@@ -352,6 +356,26 @@ static int start_statd()
+@@ -352,6 +359,26 @@ static int start_statd()
  #endif
  	return 0;
  }
@@ -49,7 +56,7 @@
  
  int main(int argc, char *argv[])
  {
-@@ -509,6 +533,9 @@ int main(int argc, char *argv[])
+@@ -509,6 +536,9 @@ int main(int argc, char *argv[])
  	    }
  	}
  
@@ -59,7 +66,7 @@
  	if (nfs_mount_vers == 4)
  		mnt_err = nfs4mount(spec, mount_point, &flags, &extra_opts, &mount_opts, 0);
  	else {
-@@ -539,7 +566,7 @@ int main(int argc, char *argv[])
+@@ -539,7 +569,7 @@ int main(int argc, char *argv[])
  					   mount_opts);
  
  		if (mnt_err) {


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-7/nfs-utils.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- nfs-utils.spec	18 Jul 2007 15:22:44 -0000	1.151
+++ nfs-utils.spec	18 Jul 2007 20:39:02 -0000	1.152
@@ -37,7 +37,7 @@
 Patch90: nfs-utils-1.0.9-mount-fsc.patch
 %endif
 
-Patch100: nfs-utils-1.0.9-compile.patch
+#Patch100: nfs-utils-1.0.9-compile.patch
 
 Group: System Environment/Daemons
 Provides: exportfs    = %{epoch}:%{version}-%{release}
@@ -93,7 +93,7 @@
 %patch06 -p1
 %patch07 -p1
 %patch08 -p1
-%patch09 -p1
+#%patch09 -p1
 
 %if %{enablefscache}
 %patch90 -p1