From 039fd901402acb0d00a3e6839542622f6f56a53e Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Dec 29 2010 08:17:00 +0000
Subject: drop filegui and vfscrash patches - applied upstream


---

diff --git a/mc-fileguicrash.patch b/mc-fileguicrash.patch
deleted file mode 100644
index 630e502..0000000
--- a/mc-fileguicrash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up mc-4.7.5-pre1/src/filemanager/filegui.c.fileguicrash mc-4.7.5-pre1/src/filemanager/filegui.c
---- mc-4.7.5-pre1/src/filemanager/filegui.c.fileguicrash	2010-12-06 12:03:56.000000000 +0100
-+++ mc-4.7.5-pre1/src/filemanager/filegui.c	2010-12-09 08:12:33.452156885 +0100
-@@ -617,7 +617,7 @@ file_op_context_create_ui_without_init (
-     if ((right_panel == current_panel) && !classic_progressbar)
-     {
-         ui->progress_file_gauge->from_left_to_right = FALSE;
--        if (dialog_type == FILEGUI_DIALOG_MULTI_ITEM)
-+        if (verbose && dialog_type == FILEGUI_DIALOG_MULTI_ITEM)
-             ui->progress_total_gauge->from_left_to_right = FALSE;
-     }
- }
diff --git a/mc-vfscrash.patch b/mc-vfscrash.patch
deleted file mode 100644
index 510d517..0000000
--- a/mc-vfscrash.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -up mc-4.7.5-pre1/lib/vfs/mc-vfs/direntry.c.vfscrash mc-4.7.5-pre1/lib/vfs/mc-vfs/direntry.c
---- mc-4.7.5-pre1/lib/vfs/mc-vfs/direntry.c.vfscrash	2010-12-06 12:03:44.000000000 +0100
-+++ mc-4.7.5-pre1/lib/vfs/mc-vfs/direntry.c	2010-12-08 14:27:08.975092483 +0100
-@@ -1166,8 +1166,12 @@ vfs_s_open (struct vfs_class *me, const 
-         }
- 
-         split_dir_name (me, q, &dirname, &name, &save);
--        /* FIXME: check if vfs_s_find_inode returns NULL */
-         dir = vfs_s_find_inode (me, super, dirname, LINK_FOLLOW, FL_DIR);
-+        if (dir == NULL)
-+        {
-+            g_free (q);
-+            return NULL;
-+        }
-         if (save)
-             *save = PATH_SEP;
-         ent = vfs_s_generate_entry (me, name, dir, 0755);
-diff -up mc-4.7.5-pre1/lib/vfs/mc-vfs/gc.c.vfscrash mc-4.7.5-pre1/lib/vfs/mc-vfs/gc.c
---- mc-4.7.5-pre1/lib/vfs/mc-vfs/gc.c.vfscrash	2010-12-03 09:53:38.000000000 +0100
-+++ mc-4.7.5-pre1/lib/vfs/mc-vfs/gc.c	2010-12-08 14:35:37.886866014 +0100
-@@ -222,7 +222,7 @@ vfs_stamp_create (struct vfs_class *oldv
-         n3vfsid = NULL;
-     }
- 
--    if (!oldvfs->nothingisopen || !(*oldvfs->nothingisopen) (oldvfsid))
-+    if (!oldvfs || !oldvfs->nothingisopen || !(*oldvfs->nothingisopen) (oldvfsid))
-         return;
- 
-     vfs_addstamp (oldvfs, oldvfsid);
diff --git a/mc.spec b/mc.spec
index d26928e..07d6741 100644
--- a/mc.spec
+++ b/mc.spec
@@ -6,7 +6,7 @@ Epoch:		1
 License:	GPLv2
 Group:		System Environment/Shells
 # tarball created from git clone git://midnight-commander.org/git/mc.git
-Source0:	mc-%{version}-pre1.tar.lzma
+Source0:	mc-%{version}.tar.lzma
 URL:		http://www.midnight-commander.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	glib2-devel e2fsprogs-devel slang-devel gpm-devel groff
@@ -14,8 +14,6 @@ Requires:	dev >= 3.3-3
 
 Patch0:		mc-extensions.patch
 Patch1:		mc-mcviewsegfault.patch
-Patch2:		mc-vfscrash.patch
-Patch3:		mc-fileguicrash.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -25,11 +23,9 @@ ability to FTP, view tar and zip files, and to poke into RPMs for
 specific files.
 
 %prep
-%setup -q -n mc-4.7.5-pre1
+%setup -q
 %patch0 -p1 -b .extensions
 %patch1 -p1 -b .mcviewsegfault
-%patch2 -p1 -b .vfscrash
-%patch3 -p1 -b .fileguicrash
 
 %build
 export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS -Wno-strict-aliasing"
@@ -89,6 +85,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Tue Dec 28 2010 Jindrich Novy <jnovy@redhat.com> 4.7.5-1
 - update to mc-4.7.5
+- drop filegui and vfscrash patches - applied upstream
 
 * Thu Dec  9 2010 Jindrich Novy <jnovy@redhat.com> 4.7.5-0.3.pre1
 - fix crash in progress bar handling (#643256)