- BR: groff (#602115)

- fix segfault in mcview (#602124)
This commit is contained in:
Jindrich Novy 2010-06-09 08:15:30 +00:00
parent 3c576744e5
commit 6e41fe8dc1
2 changed files with 20 additions and 2 deletions

12
mc-mcviewsegfault.patch Normal file
View File

@ -0,0 +1,12 @@
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

10
mc.spec
View File

@ -1,7 +1,7 @@
Summary: User-friendly text console file manager and visual shell Summary: User-friendly text console file manager and visual shell
Name: mc Name: mc
Version: 4.7.2 Version: 4.7.2
Release: 1%{?dist} Release: 2%{?dist}
Epoch: 1 Epoch: 1
License: GPLv2 License: GPLv2
Group: System Environment/Shells Group: System Environment/Shells
@ -9,10 +9,11 @@ Group: System Environment/Shells
Source0: mc-%{version}.tar.lzma Source0: mc-%{version}.tar.lzma
URL: http://www.midnight-commander.org/ URL: http://www.midnight-commander.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 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 Requires: dev >= 3.3-3
Patch0: mc-extensions.patch Patch0: mc-extensions.patch
Patch1: mc-mcviewsegfault.patch
%description %description
Midnight Commander is a visual shell much like a file manager, only Midnight Commander is a visual shell much like a file manager, only
@ -24,6 +25,7 @@ specific files.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .extensions %patch0 -p1 -b .extensions
%patch1 -p1 -b .mcviewsegfault
%build %build
export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS" 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 %dir %{_libexecdir}/mc/extfs.d
%changelog %changelog
* Wed Jun 9 2010 Jindrich Novy <jnovy@redhat.com> 4.7.2-2
- BR: groff (#602115)
- fix segfault in mcview (#602124)
* Thu May 6 2010 Jindrich Novy <jnovy@redhat.com> 4.7.2-1 * Thu May 6 2010 Jindrich Novy <jnovy@redhat.com> 4.7.2-1
- update to 4.7.2 - update to 4.7.2
- remove patches applied upstream - remove patches applied upstream