rpms/mc/F-11 mc-mcviewsegfault.patch, NONE, 1.1 .cvsignore, 1.40, 1.41 mc.spec, 1.144, 1.145 sources, 1.48, 1.49 mc-findfix.patch, 1.1, NONE mc-mceditcrash.patch, 1.1, NONE

[Jindrich Novy]

Author: jnovy

Update of /cvs/pkgs/rpms/mc/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17520

Modified Files:
	.cvsignore mc.spec sources 
Added Files:
	mc-mcviewsegfault.patch 
Removed Files:
	mc-findfix.patch mc-mceditcrash.patch 
Log Message:
* Wed Jun 16 2010 Jindrich Novy <jnovy at redhat.com> 4.7.2-1
- update to 4.7.2, fixes #604223
- BR: groff (#602115)
- fix segfault in mcview (#602124)


mc-mcviewsegfault.patch:
 editwidget.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mc-mcviewsegfault.patch ---
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)
 const char *
 edit_get_file_name (const WEdit * edit)
 {
-    return edit->filename;
+    return edit?edit->filename:NULL;
 }
 
 void


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mc/F-11/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	28 Feb 2010 06:11:37 -0000	1.40
+++ .cvsignore	16 Jun 2010 08:54:57 -0000	1.41
@@ -1 +1 @@
-mc-4.7.1.tar.lzma
+mc-4.7.2.tar.lzma


Index: mc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mc/F-11/mc.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- mc.spec	18 Mar 2010 14:32:01 -0000	1.144
+++ mc.spec	16 Jun 2010 08:54:58 -0000	1.145
@@ -1,6 +1,6 @@
 Summary:	User-friendly text console file manager and visual shell
 Name:		mc
-Version:	4.7.1
+Version:	4.7.2
 Release:	2%{?dist}
 Epoch:		1
 License:	GPLv2
@@ -9,12 +9,11 @@ Group:		System Environment/Shells
 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
+BuildRequires:	glib2-devel e2fsprogs-devel slang-devel gpm-devel groff
 Requires:	dev >= 3.3-3
 
 Patch0:		mc-extensions.patch
-Patch1:		mc-findfix.patch
-Patch2:		mc-mceditcrash.patch
+Patch1:		mc-mcviewsegfault.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -26,8 +25,7 @@ specific files.
 %prep
 %setup -q
 %patch0 -p1 -b .extensions
-%patch1 -p1 -b .findfix
-%patch2 -p1 -b .mceditcrash
+%patch1 -p1 -b .mcviewsegfault
 
 %build
 export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS"
@@ -60,6 +58,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/mcedit
 %{_bindir}/mcmfmt
 %{_bindir}/mcview
+%{_bindir}/mcdiff
 %{_datadir}/mc/*
 %attr(4711, vcsa, root) %{_libexecdir}/mc/cons.saver
 %{_libexecdir}/mc/mc*
@@ -86,6 +85,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libexecdir}/mc/extfs.d
 
 %changelog
+* Wed Jun 16 2010 Jindrich Novy <jnovy at redhat.com> 4.7.2-1
+- update to 4.7.2, fixes #604223
+- BR: groff (#602115)
+- fix segfault in mcview (#602124)
+
 * Thu Mar 18 2010 Jindrich Novy <jnovy at redhat.com> 4.7.1-2
 - patches from upstream:
   - fix crash in mcedit ran stand-alone (#571570)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mc/F-11/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	28 Feb 2010 06:11:38 -0000	1.48
+++ sources	16 Jun 2010 08:54:58 -0000	1.49
@@ -1 +1 @@
-dca7e2392d66e6fc6cce9c43c5fbe48e  mc-4.7.1.tar.lzma
+8e0c477b0c55123942b4b60827a44058  mc-4.7.2.tar.lzma


--- mc-findfix.patch DELETED ---


--- mc-mceditcrash.patch DELETED ---