Hello community, here is the log from the commit of package mc for openSUSE:Factory checked in at Sat Feb 12 11:53:31 CET 2011. -------- --- GNOME/mc/mc.changes 2010-12-29 23:14:58.000000000 +0100 +++ /mounts/work_src_done/STABLE/mc/mc.changes 2011-02-09 14:34:45.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Feb 9 13:21:08 UTC 2011 - vcizek@novell.com + +- update to 4.7.5.1 + * numerous changes and enhancements, see + /usr/share/doc/packages/mc/NEWS + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- mc-4.7.0.9.tar.lzma mc-int_ptr_casts.patch mc-syntax-hpp.patch New: ---- mc-4.7.5.1.tar.lzma ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mc.spec ++++++ --- /var/tmp/diff_new_pack.bpJjD6/_old 2011-02-12 11:53:18.000000000 +0100 +++ /var/tmp/diff_new_pack.bpJjD6/_new 2011-02-12 11:53:18.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package mc (Version 4.7.0.9) +# spec file for package mc # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,8 +23,8 @@ Group: Productivity/File utilities License: GPLv2+ Url: http://www.ibiblio.org/mc/ -Version: 4.7.0.9 -Release: 2 +Version: 4.7.5.1 +Release: 1 Source: mc-%{version}.tar.lzma Source1: x11_browser Source2: %{name}.desktop @@ -35,7 +35,6 @@ Patch8: mc-word_docs.patch Patch9: mc-x11browser.diff Patch12: mc-wrapper.patch -Patch14: mc-syntax-hpp.patch Patch16: mc-esc-seq.patch Patch17: mc-rpm.patch Patch20: mc-f-keys.patch @@ -50,7 +49,6 @@ # Patches from Fedora Patch50: mc-extensions.patch Patch51: mc-mcviewsegfault.patch -Patch52: mc-int_ptr_casts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: audiofile-devel BuildRequires: docbook-toys @@ -106,7 +104,6 @@ %patch8 %patch9 %patch12 -%patch14 %patch16 %patch17 %patch20 @@ -117,7 +114,6 @@ %patch41 %patch50 %patch51 -%patch52 pushd doc/hints iconv -f iso8859-1 -t utf-8 -o mc.hint.tmp mc.hint && mv mc.hint.tmp mc.hint @@ -226,23 +222,23 @@ %config %{_sysconfdir}/mc/filehighlight.ini %config %{_sysconfdir}/mc/sfs.ini %config %{_sysconfdir}/mc/mc.menu -%config %{_sysconfdir}/mc/Syntax %config %{_sysconfdir}/mc/mc.ext %config %{_sysconfdir}/mc/mc.keymap.emacs %config %{_sysconfdir}/mc/edit.spell.rc -%config %{_sysconfdir}/mc/mc.lib %config %{_sysconfdir}/mc/cedit.menu %config %{_sysconfdir}/mc/mc.keymap.default -%config %{_sysconfdir}/mc/mc.charsets %config %{_sysconfdir}/mc/mc.keymap %config %{_sysconfdir}/mc/edit.indent.rc %dir %{_libexecdir}/mc %verify(not mode) %{_libexecdir}/mc/cons.saver %{_mandir}/man1/* %{_datadir}/mc +%{_datadir}/mc/syntax/Syntax +%{_datadir}/mc/mc.charsets +%{_datadir}/mc/mc.lib %{_libexecdir}/mc -%exclude %{_datadir}/mc/mc.hint.* -%exclude %{_datadir}/mc/mc.hlp.* +%exclude %{_datadir}/mc/hints/* +%exclude %{_datadir}/mc/help/* %exclude %{_sysconfdir}/mc/mc.menu.* %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png @@ -252,13 +248,13 @@ %lang(pl) %doc %{_mandir}/pl %lang(ru) %doc %{_mandir}/ru %lang(sr) %doc %{_mandir}/sr -%lang(cs) %doc %{_datadir}/mc/mc.*.cs -%lang(es) %doc %{_datadir}/mc/mc.*.es -%lang(hu) %doc %{_datadir}/mc/mc.*.hu -%lang(it) %doc %{_datadir}/mc/mc.*.it -%lang(nl) %doc %{_datadir}/mc/mc.*.nl -%lang(pl) %doc %{_datadir}/mc/mc.*.pl -%lang(sr) %doc %{_datadir}/mc/mc.*.sr +%lang(cs) %doc %{_datadir}/mc/*/mc.*.cs +%lang(es) %doc %{_datadir}/mc/*/mc.*.es +%lang(hu) %doc %{_datadir}/mc/*/mc.*.hu +%lang(it) %doc %{_datadir}/mc/*/mc.*.it +%lang(nl) %doc %{_datadir}/mc/*/mc.*.nl +%lang(pl) %doc %{_datadir}/mc/*/mc.*.pl +%lang(sr) %doc %{_datadir}/mc/*/mc.*.sr %files lang -f %{name}.lang ++++++ 02_ignore_ftp_chmod_error.patch ++++++ --- /var/tmp/diff_new_pack.bpJjD6/_old 2011-02-12 11:53:18.000000000 +0100 +++ /var/tmp/diff_new_pack.bpJjD6/_new 2011-02-12 11:53:18.000000000 +0100 @@ -1,13 +1,13 @@ Index: lib/vfs/mc-vfs/ftpfs.c =================================================================== ---- lib/vfs/mc-vfs/ftpfs.c.orig 2010-09-07 08:53:07.000000000 +0200 -+++ lib/vfs/mc-vfs/ftpfs.c 2010-09-14 15:58:24.445150391 +0200 -@@ -1670,7 +1670,7 @@ static int ftpfs_chmod (struct vfs_class +--- lib/vfs/mc-vfs/ftpfs.c.orig ++++ lib/vfs/mc-vfs/ftpfs.c +@@ -1987,7 +1987,7 @@ ftpfs_chmod (struct vfs_class *me, const - g_snprintf(buf, sizeof(buf), "SITE CHMOD %4.4o /%%s", mode & 07777); + g_snprintf (buf, sizeof (buf), "SITE CHMOD %4.4o /%%s", mode & 07777); -- ret = ftpfs_send_command(me, path, buf, OPT_FLUSH); -+ ret = ftpfs_send_command(me, path, buf, OPT_FLUSH | OPT_IGNORE_ERROR); +- ret = ftpfs_send_command (me, path, buf, OPT_FLUSH); ++ ret = ftpfs_send_command (me, path, buf, OPT_FLUSH | OPT_IGNORE_ERROR); - if ( mc_config_get_bool (mc_main_config, CONFIG_APP_SECTION, - "ignore_ftp_chattr_errors", TRUE)) { + return ftpfs_ignore_chattr_errors ? 0 : ret; + } ++++++ mc-mcviewsegfault.patch ++++++ --- /var/tmp/diff_new_pack.bpJjD6/_old 2011-02-12 11:53:18.000000000 +0100 +++ /var/tmp/diff_new_pack.bpJjD6/_new 2011-02-12 11:53:18.000000000 +0100 @@ -1,13 +1,13 @@ Index: src/editor/editwidget.c =================================================================== ---- src/editor/editwidget.c.orig 2010-07-05 21:12:51.000000000 +0200 -+++ src/editor/editwidget.c 2010-07-07 15:31:11.479082454 +0200 -@@ -271,7 +271,7 @@ edit_file (const char *_file, int line) +--- src/editor/editwidget.c.orig ++++ src/editor/editwidget.c +@@ -387,7 +387,7 @@ edit_file (const char *_file, int line) const char * - edit_get_file_name (const WEdit *edit) + edit_get_file_name (const WEdit * edit) { - return edit->filename; + return edit?edit->filename:NULL; } - void + /* --------------------------------------------------------------------------------------------- */ ++++++ mc-multi-press-f-keys.patch ++++++ --- /var/tmp/diff_new_pack.bpJjD6/_old 2011-02-12 11:53:18.000000000 +0100 +++ /var/tmp/diff_new_pack.bpJjD6/_new 2011-02-12 11:53:18.000000000 +0100 @@ -1,9 +1,9 @@ http://www.midnight-commander.org/ticket/287 Index: lib/tty/key.c =================================================================== ---- lib/tty/key.c.orig 2010-07-07 17:32:15.521891000 +0200 -+++ lib/tty/key.c 2010-07-07 17:32:15.897891000 +0200 -@@ -897,10 +897,13 @@ correct_key_code (int code) +--- lib/tty/key.c.orig ++++ lib/tty/key.c +@@ -969,10 +969,13 @@ correct_key_code (int code) mod = 0; } @@ -18,7 +18,7 @@ /* * We are not interested if Ctrl was pressed when entering control * characters, so assume that it was. When checking for such keys, -@@ -965,6 +968,16 @@ correct_key_code (int code) +@@ -1058,6 +1061,16 @@ correct_key_code (int code) mod &= ~KEY_M_SHIFT; } @@ -33,10 +33,10 @@ + } + if (!alternate_plus_minus) - switch (c) { - case KEY_KP_ADD: -@@ -1613,7 +1626,7 @@ get_key_code (int no_delay) - if ((parent != NULL) && (parent->action == MCKEY_ESCAPE)) { + switch (c) + { +@@ -1724,7 +1737,7 @@ get_key_code (int no_delay) + { /* Convert escape-digits to F-keys */ if (g_ascii_isdigit (c)) - c = KEY_F (c - '0'); @@ -46,13 +46,13 @@ else Index: lib/tty/tty-slang.h =================================================================== ---- lib/tty/tty-slang.h.orig 2010-07-05 21:12:51.000000000 +0200 -+++ lib/tty/tty-slang.h 2010-07-07 17:33:45.962779000 +0200 -@@ -16,6 +16,7 @@ enum { - }; +--- lib/tty/tty-slang.h.orig ++++ lib/tty/tty-slang.h +@@ -11,6 +11,7 @@ + /*** typedefs(not structures) and defined constants **********************************************/ - #define KEY_F(x) (1000 + x) + #define KEY_F(x) (1000 + x) +#define KEY_F_IMMUTABLE(x) (970+x) - #define ACS_VLINE SLSMG_VLINE_CHAR - #define ACS_HLINE SLSMG_HLINE_CHAR + #define ACS_VLINE SLSMG_VLINE_CHAR + #define ACS_HLINE SLSMG_HLINE_CHAR ++++++ mc-rpm.patch ++++++ --- /var/tmp/diff_new_pack.bpJjD6/_old 2011-02-12 11:53:18.000000000 +0100 +++ /var/tmp/diff_new_pack.bpJjD6/_new 2011-02-12 11:53:18.000000000 +0100 @@ -1,24 +1,8 @@ Index: misc/syntax/spec.syntax =================================================================== ---- misc/syntax/spec.syntax.orig 2010-07-05 21:12:51.000000000 +0200 -+++ misc/syntax/spec.syntax 2010-07-06 19:24:41.303406337 +0200 -@@ -12,6 +12,7 @@ context default - keyword whole Description: green - keyword whole Distribution: green - keyword whole Doc\{Dd\}ir: green -+ keyword whole Enhances: green - keyword whole Epoch: green - keyword whole Exclude\{Aa\}rch: green - keyword whole Exclusive\{Aa\}rch: green -@@ -27,6 +28,7 @@ context default - keyword whole Prefix: green - keyword whole Pre\{Rr\}eq: green - keyword whole Provides: green -+ keyword whole Recommends: green - keyword whole Release: green - keyword whole Requires: green - keyword whole Requires(\[abcdefghijklmnopqrstuvwxyz\]): green -@@ -35,6 +37,7 @@ context default +--- misc/syntax/spec.syntax.orig ++++ misc/syntax/spec.syntax +@@ -35,6 +35,7 @@ context default keyword whole Source\[0123456789\]: green keyword whole Suggests: green keyword whole Summary: green @@ -28,9 +12,9 @@ keyword whole U\{Rr\}\{Ll\}: green Index: lib/vfs/mc-vfs/extfs/rpm =================================================================== ---- lib/vfs/mc-vfs/extfs/rpm.orig 2010-07-05 21:12:51.000000000 +0200 -+++ lib/vfs/mc-vfs/extfs/rpm 2010-07-07 11:31:08.411018868 +0200 -@@ -154,8 +154,14 @@ mcrpmfs_list_fastRPM () +--- lib/vfs/mc-vfs/extfs/rpm.orig ++++ lib/vfs/mc-vfs/extfs/rpm +@@ -153,8 +153,14 @@ mcrpmfs_list_fastRPM () echo "$FILEPREF 0 $DATE INFO/EPOCH" echo "$FILEPREF 0 $DATE INFO/LICENSE" echo "$FILEPREF 0 $DATE INFO/REQUIRENAME" @@ -45,7 +29,7 @@ echo "$FILEPREF 0 $DATE INFO/CONFLICTS" echo "$FILEPREF 0 $DATE INFO/CHANGELOG" } -@@ -273,6 +279,10 @@ mcrpmfs_copyout () +@@ -272,6 +278,10 @@ mcrpmfs_copyout () INFO/LICENSE) mcrpmfs_getOneTag "LICENSE" >"$2"; exit 0;; INFO/RPMVERSION) mcrpmfs_getRawOneTag "%{RPMVERSION}\n" >"$2"; exit 0;; INFO/REQUIRENAME) mcrpmfs_getRawOneTag "[%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]" >"$2"; exit 0;; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de