diff --git a/.cvsignore b/.cvsignore index a345f35..96a6ebe 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ mc-4.6.1a.tar.bz2 mc-2006-06-30-18.tar.gz +mc-2006-08-12-18.tar.gz diff --git a/mc-exit.patch b/mc-exit.patch new file mode 100644 index 0000000..f6f48c4 --- /dev/null +++ b/mc-exit.patch @@ -0,0 +1,14 @@ +--- mc-2006-08-12-18/src/command.c.exit 2005-06-07 16:16:19.000000000 +0200 ++++ mc-2006-08-12-18/src/command.c 2006-08-15 12:48:12.000000000 +0200 +@@ -214,6 +214,11 @@ + size_t i, j, cmd_len; + + if (!vfs_current_is_local ()) { ++ if (strcmp (cmd, "exit") == 0) { ++ quiet_quit_cmd (); ++ return MSG_HANDLED; ++ } ++ + message (1, MSG_ERROR, + _ + (" Cannot execute commands on non-local filesystems")); diff --git a/mc.spec b/mc.spec index ae76f3a..3df3208 100644 --- a/mc.spec +++ b/mc.spec @@ -1,9 +1,9 @@ -%define date 2006-06-30-18 +%define date 2006-08-12-18 Summary: User-friendly text console file manager and visual shell Name: mc Version: 4.6.1a -Release: 22 +Release: 23%{?dist} Epoch: 1 License: GPL Group: System Environment/Shells @@ -24,8 +24,7 @@ Patch8: mc-showfree.patch Patch9: mc-cedit.patch Patch10: mc-delcheck.patch Patch11: mc-etcmc.patch -Patch12: mc-rpmobsolete.patch -Patch13: mc-case.patch +Patch12: mc-exit.patch %description Midnight Commander is a visual shell much like a file manager, only @@ -48,8 +47,7 @@ specific files. %patch9 -p1 -b .cedit %patch10 -p1 -b .delcheck %patch11 -p1 -b .etcmc -%patch12 -p1 -b .rpmobsolete -%patch13 -p1 -b .case +%patch12 -p1 -b .exit # convert files in /lib to UTF-8 pushd lib @@ -194,6 +192,12 @@ rm -rf $RPM_BUILD_ROOT %dir %{_sysconfdir}/mc %changelog +* Tue Aug 15 2006 Jindrich Novy 4.6.1a-23.fc6 +- update to new mc CVS snapshot +- drop .case, .rpmobsolete patches - applied upstream +- allow exit command even on non-local filesystems (#202440) +- use %%{?dist} + * Mon Jul 17 2006 Jindrich Novy 4.6.1a-22 - use less ugly UTF-8 special characters for scrollbars - properly highlight RPM tags that differ in case while diff --git a/sources b/sources index 9d3930e..7e96574 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -02fba8b9697173a047fdc74dddcbaf97 mc-2006-06-30-18.tar.gz +b6cf6a011da6481e50e25cea4c85143d mc-2006-08-12-18.tar.gz