From 65baa8f77eff1ab9389930ca4d9975a06ba0b31e Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@fedoraproject.org>
Date: Mar 18 2010 14:32:01 +0000
Subject: - patches from upstream:

- fix crash in mcedit ran stand-alone (#571570)
- fix segfault when trying to panelize find results (#569823)

---

diff --git a/mc-findfix.patch b/mc-findfix.patch
new file mode 100644
index 0000000..450ddd7
--- /dev/null
+++ b/mc-findfix.patch
@@ -0,0 +1,21 @@
+commit 7b9226c5da3a81fb758bee70aafe05bb64d37464
+Author: Andrew Borodin <aborodin@vmail.ru>
+Date:   Sun Feb 28 18:19:52 2010 +0300
+
+    Ticket #2068: fixed segfault in panelization of file find result.
+    
+    Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
+
+diff --git a/src/find.c b/src/find.c
+index dc38e5f..883cb07 100644
+--- a/src/find.c
++++ b/src/find.c
+@@ -1255,7 +1255,7 @@ find_file (const char *start_dir, const char *pattern, const char *content,
+ 	    const char *lc_filename = NULL;
+ 	    WLEntry *le = (WLEntry *) entry->data;
+ 
+-	    if ((le->text == NULL) || (entry->data == NULL))
++	    if ((le->text == NULL) || (le->data == NULL))
+ 		continue;
+ 
+ 	    if (content_pattern != NULL)
diff --git a/mc-mceditcrash.patch b/mc-mceditcrash.patch
new file mode 100644
index 0000000..3eab2fd
--- /dev/null
+++ b/mc-mceditcrash.patch
@@ -0,0 +1,27 @@
+commit d2a9152cec8db6d21af77bb91490666a85e48d55
+Author: Andrew Borodin <aborodin@vmail.ru>
+Date:   Sat Mar 6 11:08:18 2010 +0300
+
+    Ticket #2087: crash in standalone editor and viewer.
+    
+    Don't try update file manager panels if mc runs as standalone editor or viewer.
+    
+    Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
+
+diff --git a/src/execute.c b/src/execute.c
+index e8f9ad3..16c0898 100644
+--- a/src/execute.c
++++ b/src/execute.c
+@@ -304,8 +304,10 @@ toggle_panels (void)
+     }
+ #endif				/* HAVE_SUBSHELL_SUPPORT */
+ 
+-    update_panels (UP_OPTIMIZE, UP_KEEPSEL);
+-    update_xterm_title_path ();
++    if ((view_one_file == NULL) && (edit_one_file == NULL)) {
++	update_panels (UP_OPTIMIZE, UP_KEEPSEL);
++	update_xterm_title_path ();
++    }
+     repaint_screen ();
+ }
+ 
diff --git a/mc.spec b/mc.spec
index 440ff97..b4d7281 100644
--- a/mc.spec
+++ b/mc.spec
@@ -1,7 +1,7 @@
 Summary:	User-friendly text console file manager and visual shell
 Name:		mc
 Version:	4.7.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Epoch:		1
 License:	GPLv2
 Group:		System Environment/Shells
@@ -13,6 +13,8 @@ BuildRequires:	glib2-devel e2fsprogs-devel slang-devel gpm-devel
 Requires:	dev >= 3.3-3
 
 Patch0:		mc-extensions.patch
+Patch1:		mc-findfix.patch
+Patch2:		mc-mceditcrash.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -24,6 +26,8 @@ specific files.
 %prep
 %setup -q
 %patch0 -p1 -b .extensions
+%patch1 -p1 -b .findfix
+%patch2 -p1 -b .mceditcrash
 
 %build
 export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS"
@@ -82,6 +86,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libexecdir}/mc/extfs.d
 
 %changelog
+* Thu Mar 18 2010 Jindrich Novy <jnovy@redhat.com> 4.7.1-2
+- patches from upstream:
+  - fix crash in mcedit ran stand-alone (#571570)
+  - fix segfault when trying to panelize find results (#569823)
+
 * Sun Feb 28 2010 Jindrich Novy <jnovy@redhat.com> 4.7.1-1
 - update to 4.7.1