rpms/mc/F-8 mc-preserveattr.patch,NONE,1.1 mc.spec,1.127,1.128

[Jindrich Novy (jnovy)]

Author: jnovy

Update of /cvs/extras/rpms/mc/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28069

Modified Files:
	mc.spec 
Added Files:
	mc-preserveattr.patch 
Log Message:
- don't preserve attributes in copy/move while the option is
  switched off (#195614)
- rebuild to fix iso9660 vfs because of missing gawk in
  buildroot (#381751, #363611)


mc-preserveattr.patch:

--- NEW FILE mc-preserveattr.patch ---
diff -up mc-2007-06-04-22/src/file.c.preserveattr mc-2007-06-04-22/src/file.c
--- mc-2007-06-04-22/src/file.c.preserveattr	2007-11-14 14:45:23.000000000 +0100
+++ mc-2007-06-04-22/src/file.c	2007-11-14 14:45:23.000000000 +0100
@@ -800,7 +800,7 @@ copy_file_file (FileOpContext *ctx, cons
 	    }
 	}
 
-	if (!appending) {
+	if (!appending && ctx->preserve) {
 	    while (mc_chmod (dst_path, (src_mode & ctx->umask_kill))) {
 		temp_status = file_error (
 			_(" Cannot chmod target file \"%s\" \n %s "), dst_path);


Index: mc.spec
===================================================================
RCS file: /cvs/extras/rpms/mc/F-8/mc.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- mc.spec	23 Aug 2007 06:16:24 -0000	1.127
+++ mc.spec	14 Nov 2007 13:56:27 -0000	1.128
@@ -3,7 +3,7 @@
 Summary:	User-friendly text console file manager and visual shell
 Name:		mc
 Version:	4.6.1a
-Release:	49.20070604cvs%{?dist}
+Release:	50.20070604cvs%{?dist}
 Epoch:		1
 License:	GPLv2
 Group:		System Environment/Shells
@@ -30,6 +30,7 @@
 Patch14:	mc-cloexec.patch
 Patch15:	mc-prompt.patch
 Patch16:	mc-refresh.patch
+Patch17:	mc-preserveattr.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -58,6 +59,7 @@
 %patch14 -p1 -b .cloexec
 %patch15 -p1 -b .prompt
 %patch16 -p1 -b .refresh
+%patch17 -p1 -b .preserveattr
 
 # convert files in /lib to UTF-8
 pushd lib
@@ -196,6 +198,12 @@
 %dir %{_libexecdir}/mc
 
 %changelog
+* Wed Nov 14 2007 Jindrich Novy <jnovy at redhat.com> 4.6.1a-50
+- don't preserve attributes in copy/move while the option is
+  switched off (#195614)
+- rebuild to fix iso9660 vfs because of missing gawk in
+  buildroot (#381751, #363611)
+
 * Thu Aug 23 2007 Jindrich Novy <jnovy at redhat.com> 4.6.1a-49
 - update License
 - rebuild for ppc32