Sisyphus
: 23 2016 | : 17442 | : 7723112
en ru br
ALT
S:4.8.17-alt1
5.1: 4.8.11-alt0.M51.1
4.1: 4.6.2-alt7.pre1
4.0: 4.6.1r-alt9
3.0: 4.6.1r-alt3
www.altlinux.org/Changes

::
: mc

             Sources      Gear   Bugs and FR  Repocop 

: mc-4.8.8-alt3.patch



 .../tags/2acb1c33ea45a79f9306ec11051e4f7f9d05efcd  | 13 ++++
 .../tags/ee6693e4a4275a6ab12547d4cb9302999e301753  | 13 ----
 .gear/tags/list                                    |  2 +-
 alt-patches/mc-4.8.6-alt-forceexec.patch           | 72 ---------------------
 alt-patches/mc-4.8.6-alt-syntax-mak.patch          | 13 ----
 alt-patches/mc-4.8.8-alt-forceexec.patch           | 72 +++++++++++++++++++++
 ...2dc152480607eaca220284330f10a0864a492-man.patch | 73 ++++++++++++++++++++++
 lib/widget/label.c                                 |  4 +-
 mc.spec                                            | 30 ++++++---
 9 files changed, 181 insertions(+), 111 deletions(-)
diff --git a/.gear/tags/2acb1c33ea45a79f9306ec11051e4f7f9d05efcd b/.gear/tags/2acb1c33ea45a79f9306ec11051e4f7f9d05efcd
new file mode 100644
index 0000000..2473ae5
--- /dev/null
+++ b/.gear/tags/2acb1c33ea45a79f9306ec11051e4f7f9d05efcd
@@ -0,0 +1,13 @@
+object b56fe795e49e2bd5f276daa91c6019dfc1010ae6
+type commit
+tag 4.8.8
+tagger Sergey Y. Afonin <asy@altlinux.org> 1365364116 +0400
+
+4.8.8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.13 (GNU/Linux)
+
+iEYEABECAAYFAlFhzZQACgkQ9lmILNBvYftrkwCfU0qI8hLVNWfafTcIkSBxohB9
+H10An02Ihh1Ym9d4jbA0QXjz1beogxYV
+=svS+
+-----END PGP SIGNATURE-----
diff --git a/.gear/tags/ee6693e4a4275a6ab12547d4cb9302999e301753 b/.gear/tags/ee6693e4a4275a6ab12547d4cb9302999e301753
deleted file mode 100644
index 37d2f30..0000000
--- a/.gear/tags/ee6693e4a4275a6ab12547d4cb9302999e301753
+++ /dev/null
@@ -1,13 +0,0 @@
-object 837e9c4fdbba138a72fc91296b91cfc9e469e60d
-type commit
-tag 4.8.7
-tagger Sergey Y. Afonin <asy@altlinux.org> 1357646482 +0400
-
-4.8.7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-iEYEABECAAYFAlDsCpIACgkQ9lmILNBvYfvVAgCffcmNJ+YV4HtRA0xBCZOmslAl
-xcMAoIICuo25CGvjvlf0c8sLRlO3MRYx
-=4qEy
------END PGP SIGNATURE-----
diff --git a/.gear/tags/list b/.gear/tags/list
index cfbb0b0..5b2ea5a 100644
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-ee6693e4a4275a6ab12547d4cb9302999e301753 4.8.7
+2acb1c33ea45a79f9306ec11051e4f7f9d05efcd 4.8.8
diff --git a/alt-patches/mc-4.8.6-alt-forceexec.patch b/alt-patches/mc-4.8.6-alt-forceexec.patch
deleted file mode 100644
index 6373131..0000000
--- a/alt-patches/mc-4.8.6-alt-forceexec.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -Nur mc-4.8.6.old/po/ru.po mc-4.8.6/po/ru.po
---- mc-4.8.6.old/po/ru.po	2012-12-14 11:44:04.000000000 +0400
-+++ mc-4.8.6/po/ru.po	2012-12-14 11:58:10.168325244 +0400
-@@ -576,6 +576,9 @@
- msgid "Disables subshell support"
- msgstr "Отключить поддержку встроенной командной оболочки"
- 
-+msgid "Force subshell execution"
-+msgstr "Принудительное выполнение во встроенной командной оболочке"
-+
- msgid "Log ftp dialog to specified file"
- msgstr "Записывать диалог с FTP в заданный файл"
- 
-diff -Nur mc-4.8.6.old/src/args.c mc-4.8.6/src/args.c
---- mc-4.8.6.old/src/args.c	2012-12-14 11:44:05.000000000 +0400
-+++ mc-4.8.6/src/args.c	2012-12-14 11:53:35.008316796 +0400
-@@ -43,6 +43,7 @@
- #include "src/args.h"
- 
- /*** external variables **************************************************************************/
-+extern int force_subshell_execution;
- 
- /*** global variables ****************************************************************************/
- 
-@@ -152,6 +153,13 @@
-      N_("Disables subshell support"),
-      NULL
-     },
-+
-+    {
-+     "forceexec", 'r', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE,
-+     &force_subshell_execution,
-+     N_("Force subshell execution"),
-+     NULL
-+    },
- #endif
- 
-     /* debug options */
-diff -Nur mc-4.8.6.old/src/execute.c mc-4.8.6/src/execute.c
---- mc-4.8.6.old/src/execute.c	2012-12-14 11:44:05.000000000 +0400
-+++ mc-4.8.6/src/execute.c	2012-12-14 11:53:35.012316818 +0400
-@@ -63,6 +63,8 @@
- /*** file scope functions ************************************************************************/
- /* --------------------------------------------------------------------------------------------- */
- 
-+int force_subshell_execution = 0;
-+
- static void
- edition_post_exec (void)
- {
-@@ -290,7 +292,7 @@
- 
- #ifdef ENABLE_SUBSHELL
-     if (mc_global.tty.use_subshell)
--        if (subshell_state == INACTIVE)
-+        if (subshell_state == INACTIVE || force_subshell_execution)
-             do_execute (shell, cmd ? cmd : command, flags | EXECUTE_AS_SHELL);
-         else
-             message (D_ERROR, MSG_ERROR, _("The shell is already running a command"));
-diff -Nur mc-4.8.6.old/src/execute.h mc-4.8.6/src/execute.h
---- mc-4.8.6.old/src/execute.h	2012-09-22 01:33:25.000000000 +0400
-+++ mc-4.8.6/src/execute.h	2012-12-14 11:53:35.012316818 +0400
-@@ -28,6 +28,9 @@
- 
- /*** declarations of public functions ************************************************************/
- 
-+/* If true message "The shell is already running a command" never */
-+extern int force_subshell_execution;
-+
- /* Execute functions that use the shell to execute */
- void shell_execute (const char *command, int flags);
- 
diff --git a/alt-patches/mc-4.8.6-alt-syntax-mak.patch b/alt-patches/mc-4.8.6-alt-syntax-mak.patch
deleted file mode 100644
index 7f40340..0000000
--- a/alt-patches/mc-4.8.6-alt-syntax-mak.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/misc/syntax/Syntax b/misc/syntax/Syntax
-index 48b57dc..476d476 100644
---- a/misc/syntax/Syntax.in
-+++ b/misc/syntax/Syntax.in
-@@ -61,7 +61,7 @@ include xml.syntax
- file ..\*\\.(tt|TT)$ Template::Toolkit\sFile
- include tt.syntax
- 
--file (.\*[Mm]akefile[\\\.A-Za-z0-9]\*|..\*\\.mk|Kbuild)$ Makefile
-+file (.\*[Mm]akefile[\\\.A-Za-z0-9]\*|..\*\\.mk|..\*\\.mak|Kbuild)$ Makefile
- include makefile.syntax
- 
- file ..\*\\.(pp|PP|pas|PAS|dpr|DPR|inc|INC)$ Pascal\sProgram
diff --git a/alt-patches/mc-4.8.8-alt-forceexec.patch b/alt-patches/mc-4.8.8-alt-forceexec.patch
new file mode 100644
index 0000000..2305828
--- /dev/null
+++ b/alt-patches/mc-4.8.8-alt-forceexec.patch
@@ -0,0 +1,72 @@
+diff -Nur mc-4.8.8.orig/po/ru.po mc-4.8.8/po/ru.po
+--- mc-4.8.8.orig/po/ru.po	2013-04-07 23:44:55.000000000 +0400
++++ mc-4.8.8/po/ru.po	2013-04-08 01:53:41.782957844 +0400
+@@ -573,6 +573,9 @@
+ msgid "Disables subshell support"
+ msgstr "Отключить поддержку встроенной командной оболочки"
+ 
++msgid "Force subshell execution"
++msgstr "Принудительное выполнение во встроенной командной оболочке"
++
+ msgid "Log ftp dialog to specified file"
+ msgstr "Записывать диалог с FTP в заданный файл"
+ 
+diff -Nur mc-4.8.8.orig/src/args.c mc-4.8.8/src/args.c
+--- mc-4.8.8.orig/src/args.c	2013-04-07 23:44:55.000000000 +0400
++++ mc-4.8.8/src/args.c	2013-04-08 01:53:41.782957844 +0400
+@@ -43,6 +43,7 @@
+ #include "src/args.h"
+ 
+ /*** external variables **************************************************************************/
++extern int force_subshell_execution;
+ 
+ /*** global variables ****************************************************************************/
+ 
+@@ -152,6 +153,13 @@
+      N_("Disables subshell support"),
+      NULL
+     },
++
++    {
++     "forceexec", 'r', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE,
++     &force_subshell_execution,
++     N_("Force subshell execution"),
++     NULL
++    },
+ #endif
+ 
+     /* debug options */
+diff -Nur mc-4.8.8.orig/src/execute.c mc-4.8.8/src/execute.c
+--- mc-4.8.8.orig/src/execute.c	2013-04-07 23:44:55.000000000 +0400
++++ mc-4.8.8/src/execute.c	2013-04-08 01:55:46.098952945 +0400
+@@ -72,6 +72,8 @@
+ 
+ /* --------------------------------------------------------------------------------------------- */
+ 
++int force_subshell_execution = 0;
++
+ static void
+ edition_post_exec (void)
+ {
+@@ -422,7 +424,7 @@
+ 
+ #ifdef ENABLE_SUBSHELL
+     if (mc_global.tty.use_subshell)
+-        if (subshell_state == INACTIVE)
++        if (subshell_state == INACTIVE || force_subshell_execution)
+             do_execute (mc_global.tty.shell, cmd ? cmd : command, flags | EXECUTE_AS_SHELL);
+         else
+             message (D_ERROR, MSG_ERROR, _("The shell is already running a command"));
+diff -Nur mc-4.8.8.orig/src/execute.h mc-4.8.8/src/execute.h
+--- mc-4.8.8.orig/src/execute.h	2013-04-07 23:44:55.000000000 +0400
++++ mc-4.8.8/src/execute.h	2013-04-08 01:53:41.786957885 +0400
+@@ -28,6 +28,9 @@
+ 
+ /*** declarations of public functions ************************************************************/
+ 
++/* If true message "The shell is already running a command" never */
++extern int force_subshell_execution;
++
+ /* Execute functions that use the shell to execute */
+ void shell_execute (const char *command, int flags);
+ 
diff --git a/alt-patches/mc-5c22dc152480607eaca220284330f10a0864a492-man.patch b/alt-patches/mc-5c22dc152480607eaca220284330f10a0864a492-man.patch
new file mode 100644
index 0000000..111ae45
--- /dev/null
+++ b/alt-patches/mc-5c22dc152480607eaca220284330f10a0864a492-man.patch
@@ -0,0 +1,73 @@
+commit 5c22dc152480607eaca220284330f10a0864a492
+Author: Slava Zanko <slavazanko@gmail.com>
+Date:   Tue Apr 9 14:58:59 2013 +0300
+
+    Ticket #3003: man pages should contain charset
+    
+    man pages should contain charset for to display properly in other encodings.
+    
+    Signed-off-by: Slava Zanko <slavazanko@gmail.com>
+
+diff --git a/doc/man/es/mc.1.in b/doc/man/es/mc.1.in
+index 21db9a1..1ef6813 100644
+--- a/doc/man/es/mc.1.in
++++ b/doc/man/es/mc.1.in
+@@ -1,3 +1,4 @@
++.\" -*- mode: troff; coding: utf8 -*-
+ .\" Traducido el 6 de septiembre de 1998 por
+ .\"	Francisco Gabriel Aroca Tapia <fgat1@alu.um.es>
+ .\"
+diff --git a/doc/man/hu/mc.1.in b/doc/man/hu/mc.1.in
+index 00a8fc5..4221020 100644
+--- a/doc/man/hu/mc.1.in
++++ b/doc/man/hu/mc.1.in
+@@ -1,3 +1,4 @@
++.\" -*- mode: troff; coding: utf8 -*-
+ .\"TOPICS "Tartalomjegyzék"
+ .TH MC 1 "%DATE_OF_MAN_PAGE%" "MC Version %DISTR_VERSION%" "GNU Midnight Commander"
+ .\"SKIP_SECTION"
+diff --git a/doc/man/it/mc.1.in b/doc/man/it/mc.1.in
+index 78457ab..2e9e453 100644
+--- a/doc/man/it/mc.1.in
++++ b/doc/man/it/mc.1.in
+@@ -1,3 +1,4 @@
++.\" -*- mode: troff; coding: utf8 -*-
+ .\" Tradotto dal 15 agosto 2002 da
+ .\"     Marco Ciampa <ciampix@libero.it>
+ .\" Chi vuole contribuire aggiunga il nome qui sotto.
+diff --git a/doc/man/mc.1.in b/doc/man/mc.1.in
+index c2689bd..6690a17 100644
+--- a/doc/man/mc.1.in
++++ b/doc/man/mc.1.in
+@@ -1,3 +1,4 @@
++.\" -*- mode: troff; coding: utf8 -*-
+ .\"TOPICS "Topics:"
+ .TH MC 1 "%DATE_OF_MAN_PAGE%" "MC Version %DISTR_VERSION%" "GNU Midnight Commander"
+ .\"SKIP_SECTION"
+diff --git a/doc/man/pl/mc.1.in b/doc/man/pl/mc.1.in
+index 88d346a..b4a1493 100644
+--- a/doc/man/pl/mc.1.in
++++ b/doc/man/pl/mc.1.in
+@@ -1,3 +1,4 @@
++.\" -*- mode: troff; coding: utf8 -*-
+ .\"Przetłumaczone przez by Macieja Wojciechowskiego    wojciech@staszic.waw.pl
+ .TH MC 1 "%DATE_OF_MAN_PAGE%" "MC Version %DISTR_VERSION%" "GNU Midnight Commander"
+ .\"SKIP_SECTION"
+diff --git a/doc/man/ru/mc.1.in b/doc/man/ru/mc.1.in
+index f69bacb..8a2ccc5 100644
+--- a/doc/man/ru/mc.1.in
++++ b/doc/man/ru/mc.1.in
+@@ -1,3 +1,4 @@
++.\" -*- mode: troff; coding: utf8 -*-
+ .\"TOPICS "Разделы помощи:"
+ .\" TODO: Перевести раздел EXTernal File System
+ .TH MC 1 "%DATE_OF_MAN_PAGE%" "MC Version %DISTR_VERSION%" "GNU Midnight Commander"
+diff --git a/doc/man/sr/mc.1.in b/doc/man/sr/mc.1.in
+index 3202618..0843dbf 100644
+--- a/doc/man/sr/mc.1.in
++++ b/doc/man/sr/mc.1.in
+@@ -1,3 +1,4 @@
++.\" -*- mode: troff; coding: utf8 -*-
+ .\"TOPICS "Теме:"
+ .TH ПН 1 "%DATE_OF_MAN_PAGE%" "ПН верзија %DISTR_VERSION%" "ГНУ\-ов поноћни наредник"
+ .\"SKIP_SECTION"
diff --git a/lib/widget/label.c b/lib/widget/label.c
index 965fbcf..9201f20 100644
--- a/lib/widget/label.c
+++ b/lib/widget/label.c
@@ -182,10 +182,10 @@ label_set_text (WLabel * label, const char *text)
         }
     }
 
+    widget_redraw (w);
+
     if (newcols < w->cols)
         w->cols = newcols;
-
-    widget_redraw (w);
 }
 
 /* --------------------------------------------------------------------------------------------- */
diff --git a/mc.spec b/mc.spec
index 87e93d0..54822b3 100644
--- a/mc.spec
+++ b/mc.spec
@@ -1,6 +1,6 @@
 Name: mc
-Version: 4.8.7
-Release: alt1
+Version: 4.8.8
+Release: alt3
 
 License: %gpl3plus
 Summary: An user-friendly file manager and visual shell
@@ -30,16 +30,16 @@ Patch3: mc-4.7.0.2-alt-menu.patch
 Patch101: mc-4.7.0.2-savannah-edit-homekey.patch
 
 # http://www.midnight-commander.org/ticket/2496
-Patch102: mc-4.8.6-alt-forceexec.patch
-
-# http://www.midnight-commander.org/ticket/2896
-Patch103: mc-4.8.6-alt-syntax-mak.patch
+Patch102: mc-4.8.8-alt-forceexec.patch
 
 # http://www.midnight-commander.org/ticket/34
-Patch104: mc-4.8.6-alt-extfs-udar.patch
+Patch103: mc-4.8.6-alt-extfs-udar.patch
 
 # http://www.midnight-commander.org/ticket/2812
-Patch105: mc-4.8.6-alt-extfs-rpm.patch
+Patch104: mc-4.8.6-alt-extfs-rpm.patch
+
+# http://www.midnight-commander.org/ticket/3003
+Patch105: mc-5c22dc152480607eaca220284330f10a0864a492-man.patch
 
 BuildRequires(pre): rpm-build-licenses
 
@@ -162,8 +162,8 @@ install -pD -m644 %SOURCE5 %buildroot%_niconsdir/%name.png
 %config(noreplace) %_sysconfdir/mc/filehighlight.ini
 %config(noreplace) %_sysconfdir/mc/mc.ext
 %config(noreplace) %_sysconfdir/mc/mc.keymap
-%config(noreplace) %_sysconfdir/mc/mc.keymap.default
-%config(noreplace) %_sysconfdir/mc/mc.keymap.emacs
+%config(noreplace) %_sysconfdir/mc/mc.default.keymap
+%config(noreplace) %_sysconfdir/mc/mc.emacs.keymap
 %config(noreplace) %_sysconfdir/mc/mc.menu
 %config(noreplace) %_sysconfdir/mc/mc.menu.sr
 %config(noreplace) %_sysconfdir/mc/sfs.ini
@@ -182,6 +182,16 @@ install -pD -m644 %SOURCE5 %buildroot%_niconsdir/%name.png
 %files full
 
 %changelog
+* Tue Apr 09 2013 Sergey Y. Afonin <asy@altlinux.ru> 4.8.8-alt3
+- applied patch for mc ticket #3003 (ALT #28817)
+
+* Mon Apr 08 2013 Sergey Y. Afonin <asy@altlinux.ru> 4.8.8-alt2
+- merged with git://github.com/MidnightCommander/mc.git
+  (ticket #2991 closed)
+
+* Sun Apr 07 2013 Sergey Y. Afonin <asy@altlinux.ru> 4.8.8-alt1
+- 4.8.8
+
 * Tue Jan 08 2013 Sergey Y. Afonin <asy@altlinux.ru> 4.8.7-alt1
 - 4.8.7
 - removed xdg-open-quickdisable.patch (moved to upstream)
 
: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
: Michael Shigorin