commit 678ce96f55ddd5f816a3c6b3a89d44943d9c3091
Author: Jindrich Novy <jnovy at redhat.com>
Date: Wed Jan 12 09:30:29 2011 +0100
update to mc-4.7.5
.gitignore | 2 +-
mc-fileguicrash.patch | 12 ------------
mc-globfix.patch | 11 -----------
mc-mcviewsegfault.patch | 10 +++++-----
mc-vfscrash.patch | 29 -----------------------------
mc.spec | 19 +++++++------------
sources | 2 +-
7 files changed, 14 insertions(+), 71 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c520844..03d9a9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-mc-4.7.4.tar.lzma
+mc-4.7.5.tar.lzma
diff --git a/mc-mcviewsegfault.patch b/mc-mcviewsegfault.patch
index a7c00da..2550988 100644
--- a/mc-mcviewsegfault.patch
+++ b/mc-mcviewsegfault.patch
@@ -1,7 +1,7 @@
-diff -up mc-4.7.2.99/src/editor/editwidget.c.mcviewsegfault mc-4.7.2.99/src/editor/editwidget.c
---- mc-4.7.2.99/src/editor/editwidget.c.mcviewsegfault 2010-06-08 13:23:03.000000000 +0200
-+++ mc-4.7.2.99/src/editor/editwidget.c 2010-06-08 13:28:14.960729778 +0200
-@@ -286,7 +286,7 @@ edit_file (const char *_file, int line)
+diff -up mc-4.7.5-pre1/src/editor/editwidget.c.mcviewsegfault mc-4.7.5-pre1/src/editor/editwidget.c
+--- mc-4.7.5-pre1/src/editor/editwidget.c.mcviewsegfault 2010-12-03 09:53:38.000000000 +0100
++++ mc-4.7.5-pre1/src/editor/editwidget.c 2010-12-08 12:33:35.943724419 +0100
+@@ -387,7 +387,7 @@ edit_file (const char *_file, int line)
const char *
edit_get_file_name (const WEdit * edit)
{
@@ -9,4 +9,4 @@ diff -up mc-4.7.2.99/src/editor/editwidget.c.mcviewsegfault mc-4.7.2.99/src/edit
+ return edit?edit->filename:NULL;
}
- void
+ /* --------------------------------------------------------------------------------------------- */
diff --git a/mc.spec b/mc.spec
index 33693c8..e5abaf8 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.4
-Release: 4%{?dist}
+Version: 4.7.5
+Release: 1%{?dist}
Epoch: 1
License: GPLv2
Group: System Environment/Shells
@@ -14,9 +14,6 @@ Requires: dev >= 3.3-3
Patch0: mc-extensions.patch
Patch1: mc-mcviewsegfault.patch
-Patch2: mc-globfix.patch
-Patch3: mc-vfscrash.patch
-Patch4: mc-fileguicrash.patch
%description
Midnight Commander is a visual shell much like a file manager, only
@@ -29,9 +26,6 @@ specific files.
%setup -q
%patch0 -p1 -b .extensions
%patch1 -p1 -b .mcviewsegfault
-%patch2 -p1 -b .globfix
-%patch3 -p1 -b .vfscrash
-%patch4 -p1 -b .fileguicrash
%build
export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS -Wno-strict-aliasing"
@@ -62,7 +56,6 @@ rm -rf $RPM_BUILD_ROOT
%doc doc/FAQ doc/COPYING doc/NEWS doc/README
%{_bindir}/mc
%{_bindir}/mcedit
-%{_bindir}/mcmfmt
%{_bindir}/mcview
%{_bindir}/mcdiff
%{_datadir}/mc/*
@@ -78,9 +71,6 @@ rm -rf $RPM_BUILD_ROOT
%lang(ru) %{_mandir}/ru/man1/mc.1*
%lang(sr) %{_mandir}/sr/man1/mc.1*
%{_sysconfdir}/profile.d/*
-%config %{_sysconfdir}/mc/Syntax
-%config %{_sysconfdir}/mc/mc.charsets
-%config %{_sysconfdir}/mc/mc.lib
%config(noreplace) %{_sysconfdir}/mc/mc.ext
%config(noreplace) %{_sysconfdir}/mc/*edit*
%config(noreplace) %{_sysconfdir}/mc/mc.keymap*
@@ -93,6 +83,11 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_libexecdir}/mc/extfs.d
%changelog
+* Wed Jan 12 2011 Jindrich Novy <jnovy at redhat.com> 4.7.5-1
+- update to mc-4.7.5
+- drop globfix, filegui and vfscrash patches - applied upstream
+- introduce mc viewer segfault fix (#602124)
+
* Tue Dec 14 2010 Jindrich Novy <jnovy at redhat.com> 4.7.4-4
- make cons.saver not suid root, it is no more needed (#640365)
diff --git a/sources b/sources
index d9a2de8..2228e74 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9932eaef64b7501c01f06faa888e8998 mc-4.7.4.tar.lzma
+6e3d5d992d3c8ace46ecb4a55dbdca14 mc-4.7.5.tar.lzma