rpms/tuxcmd/F-12 tuxcmd-0.6.72-copy-same-source-target.patch, NONE, 1.1 tuxcmd.spec, 1.18, 1.19

[Tomas Bzatek]

Author: tbzatek

Update of /cvs/extras/rpms/tuxcmd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3225

Modified Files:
	tuxcmd.spec 
Added Files:
	tuxcmd-0.6.72-copy-same-source-target.patch 
Log Message:
* Wed Dec 23 2009 Tomas Bzatek <tbzatek at redhat.com> 0.6.69-git20091027.2
- Don't prevent copying files when src == dest across different engines


tuxcmd-0.6.72-copy-same-source-target.patch:
 UCore.pas |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE tuxcmd-0.6.72-copy-same-source-target.patch ---
>From 9e4a6521a9ea3310437962d6708cf814fafc70d1 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Thu, 19 Nov 2009 17:57:32 +0100
Subject: [PATCH] Don't prevent copying files when src == dest across different engines

This is really weird test, probably leftover from non-VFS era.
The whole copy operation needs rewrite, just another reason.
---
 UCore.pas |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/UCore.pas b/UCore.pas
index 89af1a2..b812ca0 100644
--- a/UCore.pas
+++ b/UCore.pas
@@ -1357,7 +1357,8 @@ begin
           ErrorHappened := True;
           Break;
         end;
-        if s <> string(PDataItemSL(List[i])^.FName) then
+// * FIXME: why the hell we had something like this here??
+//      if s <> string(PDataItemSL(List[i])^.FName) then
           if not HandleCopy(List[i], s) then begin
             ErrorHappened := True;
             Break;
-- 
1.6.5.5



Index: tuxcmd.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxcmd/F-12/tuxcmd.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- tuxcmd.spec	27 Oct 2009 10:27:01 -0000	1.18
+++ tuxcmd.spec	23 Dec 2009 15:23:44 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           tuxcmd
 Version:        0.6.69
-Release:        git20091027.1%{?dist}
+Release:        git20091027.2%{?dist}
 Summary:        Tux Commander: file manager with 2 panels side by side using GTK2
 
 Group:          Applications/File
@@ -23,6 +23,9 @@ BuildRequires: desktop-file-utils
 # turn smartlinking off, not needed anymore with fpc-2.2.2-2
 Patch4: tuxcmd-disable-smartlinking.patch
 
+# from upstream
+Patch5: tuxcmd-0.6.72-copy-same-source-target.patch
+
 %description
 Tux Commander is open-source file manager with 2 panels side by side written
 for GTK2. The main goal of this project is to create powerful user-friendly
@@ -61,6 +64,7 @@ This package contains networking GVFS mo
 %setup -q -b 1
 
 %patch4 -p1 -b .disable-smartlinking
+%patch5 -p1 -b .copy-equal-src-target
 
 %build
 
@@ -135,6 +139,9 @@ fi
 
 
 %changelog
+* Wed Dec 23 2009 Tomas Bzatek <tbzatek at redhat.com> 0.6.69-git20091027.2
+- Don't prevent copying files when src == dest across different engines
+
 * Tue Oct 27 2009 Tomas Bzatek <tbzatek at redhat.com> 0.6.69-git20091027.1
 - Rebase to latest git
 - Enable PowerPC architectures