[mc/f12/master] fix globbing, cons.saver and enable samba VFS
Jindrich Novy
jnovy at fedoraproject.org
Thu Oct 7 08:07:58 UTC 2010
commit c2c18936abe9e7367c9dccdda20d4d1bdd08da1d
Author: Jindrich Novy <jnovy at redhat.com>
Date: Thu Oct 7 10:08:02 2010 +0200
fix globbing, cons.saver and enable samba VFS
mc-globfix.patch | 11 +++++++++++
mc.spec | 13 ++++++++++---
2 files changed, 21 insertions(+), 3 deletions(-)
---
diff --git a/mc-globfix.patch b/mc-globfix.patch
new file mode 100644
index 0000000..ab1ce2b
--- /dev/null
+++ b/mc-globfix.patch
@@ -0,0 +1,11 @@
+diff -up mc-4.7.4/lib/search/glob.c.globfix mc-4.7.4/lib/search/glob.c
+--- mc-4.7.4/lib/search/glob.c.globfix 2010-09-07 09:16:43.000000000 +0200
++++ mc-4.7.4/lib/search/glob.c 2010-10-07 08:43:56.517785647 +0200
+@@ -144,7 +144,6 @@ mc_search__translate_replace_glob_to_reg
+ {
+ g_string_append_c (buff, '\\');
+ c = ++cnt;
+- continue;
+ }
+ break;
+ /* breaks copying: mc uses "\0" internally, it must not be changed */
diff --git a/mc.spec b/mc.spec
index 2f13a6e..9794232 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: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2
Group: System Environment/Shells
@@ -14,6 +14,7 @@ Requires: dev >= 3.3-3
Patch0: mc-extensions.patch
Patch1: mc-mcviewsegfault.patch
+Patch2: mc-globfix.patch
%description
Midnight Commander is a visual shell much like a file manager, only
@@ -26,15 +27,16 @@ specific files.
%setup -q
%patch0 -p1 -b .extensions
%patch1 -p1 -b .mcviewsegfault
+%patch2 -p1 -b .globfix
%build
export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS -Wno-strict-aliasing"
%configure --with-screen=slang \
--enable-charset \
- --with-samba \
--without-x \
--with-gpm-mouse \
--disable-rpath \
+ --enable-vfs-smb \
--enable-vfs-mcfs
make %{?_smp_mflags}
@@ -60,7 +62,7 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/mcview
%{_bindir}/mcdiff
%{_datadir}/mc/*
-%attr(4711, vcsa, root) %{_libexecdir}/mc/cons.saver
+%attr(4711, root, root) %{_libexecdir}/mc/cons.saver
%{_libexecdir}/mc/mc*
%{_libexecdir}/mc/extfs.d/*
%{_libexecdir}/mc/fish/*
@@ -87,6 +89,11 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_libexecdir}/mc/extfs.d
%changelog
+* Thu Oct 7 2010 Jindrich Novy <jnovy at redhat.com> 4.7.4-2
+- fix globbing (#629679), thanks to Denys Vlasenko
+- don't use vcsa for cons.saver (#640365)
+- enable samba VFS (#637059)
+
* Tue Sep 7 2010 Jindrich Novy <jnovy at redhat.com> 4.7.4-1
- update to 4.7.4
More information about the scm-commits
mailing list