diff --git a/.gitignore b/.gitignore index 189184b..de59742 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/mc-4.8.1.tar.xz +/mc-4.8.2.tar.xz diff --git a/mc-extensions.patch b/mc-extensions.patch index 6c35f7b..8dbe407 100644 --- a/mc-extensions.patch +++ b/mc-extensions.patch @@ -1,15 +1,3 @@ -diff -up mc-4.7.0-pre4/configure.ac.extensions mc-4.7.0-pre4/configure.ac ---- mc-4.7.0-pre4/configure.ac.extensions 2009-10-30 19:44:38.000000000 +0100 -+++ mc-4.7.0-pre4/configure.ac 2009-12-10 20:41:43.000000000 +0100 -@@ -69,7 +69,7 @@ AC_PROG_LN_S - AC_CHECK_TOOL(AR, ar, ar) - - dnl Only list browsers here that can be run in background (i.e. with `&') --AC_CHECK_PROGS(X11_WWW, [gnome-moz-remote mozilla konqueror opera netscape]) -+AC_CHECK_PROGS(X11_WWW, [firefox gnome-moz-remote mozilla konqueror opera netscape]) - - dnl - dnl Ovverriding mmap support. This has to be before AC_FUNC_MMAP is used. diff -up mc-4.7.0-pre4/misc/mc.ext.in.extensions mc-4.7.0-pre4/misc/mc.ext.in --- mc-4.7.0-pre4/misc/mc.ext.in.extensions 2009-10-29 20:02:37.000000000 +0100 +++ mc-4.7.0-pre4/misc/mc.ext.in 2009-12-10 20:46:47.000000000 +0100 diff --git a/mc-mcviewsegfault.patch b/mc-mcviewsegfault.patch deleted file mode 100644 index 2550988..0000000 --- a/mc-mcviewsegfault.patch +++ /dev/null @@ -1,12 +0,0 @@ -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) - { -- return edit->filename; -+ return edit?edit->filename:NULL; - } - - /* --------------------------------------------------------------------------------------------- */ diff --git a/mc.spec b/mc.spec index 1dbd06a..56b4fed 100644 --- a/mc.spec +++ b/mc.spec @@ -1,6 +1,6 @@ Summary: User-friendly text console file manager and visual shell Name: mc -Version: 4.8.1 +Version: 4.8.2 Release: 1%{?dist} Epoch: 1 License: GPLv3+ @@ -12,7 +12,6 @@ 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,7 +23,6 @@ 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 -Wno-strict-aliasing" @@ -82,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libexecdir}/mc/extfs.d %changelog +* Tue Mar 20 2012 Slava Zanko 1:4.8.2-1 +- update to 4.8.2 + * Thu Dec 15 2011 Jindrich Novy 4.8.1-1 - update to 4.8.1 (#767962) diff --git a/sources b/sources index 4e0a140..479c354 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0c9632b799edfb8da4665fbf20546c21 mc-4.8.1.tar.xz +1977e0ac9ec645f5ea9b8657b5518ce2 mc-4.8.2.tar.xz