rpms/mc/devel mc-mcviewsegfault.patch,NONE,1.1 mc.spec,1.161,1.162

[Jindrich Novy]

Author: jnovy

Update of /cvs/pkgs/rpms/mc/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3966

Modified Files:
	mc.spec 
Added Files:
	mc-mcviewsegfault.patch 
Log Message:
* Wed Jun  9 2010 Jindrich Novy <jnovy at redhat.com> 4.7.2-2
- 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: mc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/mc.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -p -r1.161 -r1.162
--- mc.spec	6 May 2010 04:38:34 -0000	1.161
+++ mc.spec	9 Jun 2010 08:15:30 -0000	1.162
@@ -1,7 +1,7 @@
 Summary:	User-friendly text console file manager and visual shell
 Name:		mc
 Version:	4.7.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Epoch:		1
 License:	GPLv2
 Group:		System Environment/Shells
@@ -9,10 +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-mcviewsegfault.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -24,6 +25,7 @@ specific files.
 %prep
 %setup -q
 %patch0 -p1 -b .extensions
+%patch1 -p1 -b .mcviewsegfault
 
 %build
 export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS"
@@ -83,6 +85,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libexecdir}/mc/extfs.d
 
 %changelog
+* Wed Jun  9 2010 Jindrich Novy <jnovy at redhat.com> 4.7.2-2
+- BR: groff (#602115)
+- fix segfault in mcview (#602124)
+
 * Thu May  6 2010 Jindrich Novy <jnovy at redhat.com> 4.7.2-1
 - update to 4.7.2
 - remove patches applied upstream