From 86c33ae7936b8907a41a5e1452b8023c6e704a28 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@fedoraproject.org>
Date: Nov 14 2007 13:56:27 +0000
Subject: - 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)

---

diff --git a/mc-preserveattr.patch b/mc-preserveattr.patch
new file mode 100644
index 0000000..5ce71df
--- /dev/null
+++ b/mc-preserveattr.patch
@@ -0,0 +1,12 @@
+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);
diff --git a/mc.spec b/mc.spec
index da98067..059c1dd 100644
--- a/mc.spec
+++ b/mc.spec
@@ -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 @@ Patch13:	mc-newlinedir.patch
 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 @@ specific files.
 %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 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libexecdir}/mc
 
 %changelog
+* Wed Nov 14 2007 Jindrich Novy <jnovy@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@redhat.com> 4.6.1a-49
 - update License
 - rebuild for ppc32