rpms/mc
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix globbing (#629679), thanks to Denys Vlasenko, don't use vcsa for cons.saver (#640365)

Browse Source
This commit is contained in:
Jindrich Novy 2010-10-07 09:14:24 +02:00
parent 260273c952
commit 66d2bd1739
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mc-globfix.patch Normal file
View File

@ -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 */

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.4 Version: 4.7.4
Release: 3%{?dist} Release: 4%{?dist}
Epoch: 1 Epoch: 1
License: GPLv2 License: GPLv2
Group: System Environment/Shells Group: System Environment/Shells
@ -14,6 +14,7 @@ Requires: dev >= 3.3-3
Patch0: mc-extensions.patch Patch0: mc-extensions.patch
Patch1: mc-mcviewsegfault.patch Patch1: mc-mcviewsegfault.patch
Patch2: mc-globfix.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
@ -26,6 +27,7 @@ specific files.
%setup -q %setup -q
%patch0 -p1 -b .extensions %patch0 -p1 -b .extensions
%patch1 -p1 -b .mcviewsegfault %patch1 -p1 -b .mcviewsegfault
%patch2 -p1 -b .globfix
%build %build
export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS -Wno-strict-aliasing" export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS -Wno-strict-aliasing"
@ -60,7 +62,7 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/mcview %{_bindir}/mcview
%{_bindir}/mcdiff %{_bindir}/mcdiff
%{_datadir}/mc/* %{_datadir}/mc/*
%attr(4711, vcsa, root) %{_libexecdir}/mc/cons.saver %attr(4711, root, root) %{_libexecdir}/mc/cons.saver
%{_libexecdir}/mc/mc* %{_libexecdir}/mc/mc*
%{_libexecdir}/mc/extfs.d/* %{_libexecdir}/mc/extfs.d/*
%{_libexecdir}/mc/fish/* %{_libexecdir}/mc/fish/*
@ -87,6 +89,10 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_libexecdir}/mc/extfs.d %dir %{_libexecdir}/mc/extfs.d
%changelog %changelog
* Thu Oct 7 2010 Jindrich Novy <jnovy@redhat.com> 4.7.4-4
- fix globbing (#629679), thanks to Denys Vlasenko
- don't use vcsa for cons.saver (#640365)
* Wed Sep 29 2010 jkeating - 1:4.7.4-3 * Wed Sep 29 2010 jkeating - 1:4.7.4-3
- Rebuilt for gcc bug 634757 - Rebuilt for gcc bug 634757