rpms/mc/devel mc-shellcwd.patch,NONE,1.1 mc.spec,1.135,1.136

[Jindrich Novy]

Author: jnovy

Update of /cvs/pkgs/rpms/mc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11679

Modified Files:
	mc.spec 
Added Files:
	mc-shellcwd.patch 
Log Message:
* Tue Sep  2 2008 Jindrich Novy <jnovy at redhat.com> 4.6.2-6.pre1
- do not change directory in panel to subshell directory
  when switched back from subshell (#460633)


mc-shellcwd.patch:

--- NEW FILE mc-shellcwd.patch ---
diff -up mc-4.6.2-pre1/src/subshell.c.shellcwd mc-4.6.2-pre1/src/subshell.c
--- mc-4.6.2-pre1/src/subshell.c.shellcwd	2008-09-02 11:28:31.000000000 +0200
+++ mc-4.6.2-pre1/src/subshell.c	2008-09-02 11:41:39.000000000 +0200
@@ -562,9 +562,6 @@ int invoke_subshell (const char *command
 
     feed_subshell (how, FALSE);
 
-    if (new_dir && subshell_alive && strcmp (subshell_cwd, current_panel->cwd))
-	*new_dir = subshell_cwd;  /* Make MC change to the subshell's CWD */
-
     /* Restart the subshell if it has died by SIGHUP, SIGQUIT, etc. */
     while (!subshell_alive && !quit && use_subshell)
 	init_subshell ();


Index: mc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/mc.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- mc.spec	5 Aug 2008 13:59:26 -0000	1.135
+++ mc.spec	2 Sep 2008 09:52:26 -0000	1.136
@@ -1,7 +1,7 @@
 Summary:	User-friendly text console file manager and visual shell
 Name:		mc
 Version:	4.6.2
-Release:	5.pre1%{?dist}
+Release:	6.pre1%{?dist}
 Epoch:		1
 License:	GPLv2
 Group:		System Environment/Shells
@@ -33,6 +33,7 @@
 Patch19:	mc-hintchk.patch
 Patch20:	mc-7zip.patch
 Patch21:	mc-oldrpmtags.patch
+Patch22:	mc-shellcwd.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -65,6 +66,7 @@
 %patch19 -p1 -b .hintchk
 %patch20 -p1 -b .7zip
 %patch21 -p1 -b .oldrpmtags
+%patch22 -p1 -b .shellcwd
 
 # convert files in /lib to UTF-8
 pushd lib
@@ -202,6 +204,10 @@
 %dir %{_libexecdir}/mc
 
 %changelog
+* Tue Sep  2 2008 Jindrich Novy <jnovy at redhat.com> 4.6.2-6.pre1
+- do not change directory in panel to subshell directory
+  when switched back from subshell (#460633)
+
 * Tue Aug  5 2008 Jindrich Novy <jnovy at redhat.com> 4.6.2-5.pre1
 - don't try to parse obsolete RPM tags in RPM VFS (#457912),
   thanks to Milan Broz