Accepting request 60425 from Base:System
Accepted submit request 60425 from user vitezslav_cizek OBS-URL: https://build.opensuse.org/request/show/60425 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mc?expand=0&rev=27
This commit is contained in:
Ruediger Oertel
Git OBS Bridge
commit
e857d46335
@ -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;
|
||||
}
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d4223a5a5d0f891f9389da7f49e0d837cc409705dd68667418e4f986fef98204
|
||||
size 2100303
|
||||
3
mc-4.7.5.1.tar.lzma
Normal file
3
mc-4.7.5.1.tar.lzma
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:384bf44f1df77d430dc843003126d3eebe26afb3cc1061bf7241c8c05638a5ee
|
||||
size 1934426
|
||||
@ -1,31 +0,0 @@
|
||||
Index: lib/tty/color.c
|
||||
===================================================================
|
||||
--- lib/tty/color.c.orig 2010-07-05 21:12:51.000000000 +0200
|
||||
+++ lib/tty/color.c 2010-07-09 12:15:45.223012470 +0200
|
||||
@@ -85,7 +85,7 @@ tty_color_free_condition_cb (gpointer ke
|
||||
tty_color_pair_t *mc_color_pair;
|
||||
(void) key;
|
||||
|
||||
- is_temp_color = (gboolean) user_data;
|
||||
+ is_temp_color = (gboolean) GINT_TO_POINTER(user_data);
|
||||
mc_color_pair = (tty_color_pair_t *) value;
|
||||
return (mc_color_pair->is_temp == is_temp_color);
|
||||
}
|
||||
@@ -96,7 +96,7 @@ static void
|
||||
tty_color_free_all (gboolean is_temp_color)
|
||||
{
|
||||
g_hash_table_foreach_remove (mc_tty_color__hashtable, tty_color_free_condition_cb,
|
||||
- (gpointer) is_temp_color);
|
||||
+ GINT_TO_POINTER(is_temp_color));
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------------------------------- */
|
||||
@@ -108,7 +108,7 @@ tty_color_get_next_cpn_cb (gpointer key,
|
||||
tty_color_pair_t *mc_color_pair;
|
||||
(void) key;
|
||||
|
||||
- cp = (int) user_data;
|
||||
+ cp = GPOINTER_TO_INT(user_data);
|
||||
mc_color_pair = (tty_color_pair_t *) value;
|
||||
|
||||
if (cp == mc_color_pair->pair_index)
|
||||
@ -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
|
||||
/* --------------------------------------------------------------------------------------------- */
|
||||
|
||||
@ -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 @@ Index: lib/tty/key.c
|
||||
/*
|
||||
* 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 @@ Index: lib/tty/key.c
|
||||
+ }
|
||||
+
|
||||
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,10 +46,10 @@ Index: lib/tty/key.c
|
||||
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_IMMUTABLE(x) (970+x)
|
||||
|
||||
30
mc-rpm.patch
30
mc-rpm.patch
@ -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 @@ Index: misc/syntax/spec.syntax
|
||||
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 @@ Index: lib/vfs/mc-vfs/extfs/rpm
|
||||
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;;
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
Index: misc/syntax/Syntax
|
||||
===================================================================
|
||||
--- misc/syntax/Syntax.orig 2010-07-05 21:12:51.000000000 +0200
|
||||
+++ misc/syntax/Syntax 2010-07-06 19:13:17.207010626 +0200
|
||||
@@ -85,7 +85,7 @@ include texinfo.syntax
|
||||
file ..\*\\.c$ C\sProgram
|
||||
include c.syntax
|
||||
|
||||
-file ..\*\\.([hC]|CC|cxx|cc|cpp|CPP|CXX|hxx|hh|hpp|h\.in)$ C/C\+\+\sProgram
|
||||
+file ..\*\\.([hC]|CC|cxx|cc|cpp|CPP|CXX|hxx|hh|hpp|HPP|h\.in)$ C/C\+\+\sProgram
|
||||
include cxx.syntax
|
||||
|
||||
file ..\*\\.d$ D\sProgram
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 29 22:14:04 UTC 2010 - aj@suse.de
|
||||
|
||||
|
||||
32
mc.spec
32
mc.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package mc (Version 4.7.0.9)
|
||||
# spec file for package mc (Version 4.7.5.1)
|
||||
#
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -23,7 +23,7 @@ Summary: Midnight Commander
|
||||
Group: Productivity/File utilities
|
||||
License: GPLv2+
|
||||
Url: http://www.ibiblio.org/mc/
|
||||
Version: 4.7.0.9
|
||||
Version: 4.7.5.1
|
||||
Release: 2
|
||||
Source: mc-%{version}.tar.lzma
|
||||
Source1: x11_browser
|
||||
@ -35,7 +35,6 @@ Patch7: mc-palmsupport.patch
|
||||
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 @@ Patch41: mc-multi-press-f-keys.patch
|
||||
# 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 @@ target directory.
|
||||
%patch8
|
||||
%patch9
|
||||
%patch12
|
||||
%patch14
|
||||
%patch16
|
||||
%patch17
|
||||
%patch20
|
||||
@ -117,7 +114,6 @@ target directory.
|
||||
%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 @@ rm -rf %{buildroot}
|
||||
%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 @@ rm -rf %{buildroot}
|
||||
%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
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user