rpms/mc/FC-4 mc-64bit.patch, 1.1, 1.2 mc-userhost.patch, 1.1, 1.2 mc-utf8.patch, 1.6, 1.7 mc.spec, 1.54, 1.55 sources, 1.21, 1.22 mc-spaceprompt.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jun 16 13:02:40 UTC 2005
Author: jnovy
Update of /cvs/dist/rpms/mc/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv30855
Modified Files:
mc-64bit.patch mc-userhost.patch mc-utf8.patch mc.spec sources
Removed Files:
mc-spaceprompt.patch
Log Message:
- update to more recent mc version to fix problems with dislaying
sizes of files larger than 2GB (#160295)
- drop spaceprompt patch - applied in newer version
mc-64bit.patch:
acinclude.m4 | 2 +-
src/mountlist.c | 21 +++++++++++++++++++--
2 files changed, 20 insertions(+), 3 deletions(-)
Index: mc-64bit.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/FC-4/mc-64bit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mc-64bit.patch 4 Apr 2005 07:29:29 -0000 1.1
+++ mc-64bit.patch 16 Jun 2005 13:02:36 -0000 1.2
@@ -1,6 +1,6 @@
---- mc-4.6.1-20041020/src/mountlist.c.64bit 2004-09-25 15:46:23.000000000 +0200
-+++ mc-4.6.1-20041020/src/mountlist.c 2005-04-01 16:20:27.192132368 +0200
-@@ -132,11 +132,19 @@ struct mount_entry
+--- mc-4.6.1a/src/mountlist.c.64bit 2005-02-08 23:33:52.000000000 +0100
++++ mc-4.6.1a/src/mountlist.c 2005-05-10 17:09:24.122853504 +0200
+@@ -131,11 +131,19 @@ struct mount_entry
struct fs_usage
{
@@ -20,7 +20,7 @@
};
static int get_fs_usage (char *path, struct fs_usage *fsp);
-@@ -663,6 +671,7 @@ my_statfs (struct my_statfs *myfs_stats,
+@@ -665,6 +673,7 @@ my_statfs (struct my_statfs *myfs_stats,
BLOCKS FROMSIZE-byte blocks, rounding away from zero.
TOSIZE must be positive. Return -1 if FROMSIZE is not positive. */
@@ -28,7 +28,7 @@
static long
fs_adjust_blocks (long blocks, int fromsize, int tosize)
{
-@@ -670,13 +679,21 @@ fs_adjust_blocks (long blocks, int froms
+@@ -672,13 +681,21 @@ fs_adjust_blocks (long blocks, int froms
abort ();
if (fromsize <= 0)
return -1;
@@ -52,19 +52,8 @@
}
#if defined(_AIX) && defined(_I386)
-@@ -773,9 +790,7 @@ get_fs_usage (char *path, struct fs_usag
-
- if (statvfs (path, &fsd) < 0)
- return -1;
-- /* f_frsize isn't guaranteed to be supported. */
--#define CONVERT_BLOCKS(b) \
-- fs_adjust_blocks ((b), fsd.f_frsize ? fsd.f_frsize : fsd.f_bsize, 512)
-+#define CONVERT_BLOCKS(b) fs_adjust_blocks ((b), fsd.f_frsize, 512)
- #endif
-
- #if defined(CONVERT_BLOCKS) && !defined(STAT_STATFS2_FS_DATA) && !defined(STAT_READ_FILSYS) /* !Ultrix && !SVR2. */
---- mc-4.6.1-20041020/acinclude.m4.64bit 2005-04-01 16:15:56.453290928 +0200
-+++ mc-4.6.1-20041020/acinclude.m4 2005-04-01 16:15:56.525279984 +0200
+--- mc-4.6.1a/acinclude.m4.64bit 2005-05-10 17:09:24.084859280 +0200
++++ mc-4.6.1a/acinclude.m4 2005-05-10 17:09:24.124853200 +0200
@@ -501,7 +501,7 @@ dnl job is to detect a method to get fil
if test $ac_cv_func_statvfs = yes; then
space=yes
mc-userhost.patch:
main.c | 14 ++++++++++++++
1 files changed, 14 insertions(+)
Index: mc-userhost.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/FC-4/mc-userhost.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mc-userhost.patch 24 Mar 2005 14:34:59 -0000 1.1
+++ mc-userhost.patch 16 Jun 2005 13:02:36 -0000 1.2
@@ -1,5 +1,5 @@
---- mc-4.6.1a/src/main.c.hostname 2005-03-23 13:59:31.198747928 +0100
-+++ mc-4.6.1a/src/main.c 2005-03-23 16:00:49.135333392 +0100
+--- mc-4.6.1a/src/main.c.userhost 2005-06-06 13:35:08.926427736 +0200
++++ mc-4.6.1a/src/main.c 2005-06-06 13:39:11.551543112 +0200
@@ -32,6 +32,7 @@
#include <sys/types.h>
#include <sys/stat.h>
@@ -8,26 +8,26 @@
#include "global.h"
#include "tty.h"
-@@ -1612,9 +1613,22 @@ void
+@@ -1611,9 +1612,22 @@ void
update_xterm_title_path (void)
{
- unsigned char *p, *s;
+ char *p, *s;
+ char h[64];
+ struct passwd *pw;
if (xterm_flag && xterm_title) {
p = s = g_strdup (strip_home_and_password (current_panel->cwd));
-+ if ( !gethostname (h, 64) ) {
-+ h[63] = '\0'; /* Be sure the hostname is NUL terminated */
-+ s = g_strdup_printf ("%s:%s", h, s);
-+ g_free (p);
-+ p = s;
-+ }
-+ if ( (pw = getpwuid(getuid())) ) {
-+ s = g_strdup_printf ("%s@%s", pw->pw_name, s);
-+ g_free (p);
-+ p = s;
-+ }
++ if ( !gethostname (h, 64) ) {
++ h[63] = '\0'; /* Be sure the hostname is NUL terminated */
++ s = g_strdup_printf ("%s:%s", h, s);
++ g_free (p);
++ p = s;
++ }
++ if ( (pw = getpwuid(getuid())) ) {
++ s = g_strdup_printf ("%s@%s", pw->pw_name, s);
++ g_free (p);
++ p = s;
++ }
do {
- if (*s < ' ')
- *s = '?';
+ #ifndef UTF8
+ if (!is_printable ((unsigned char) *s))
mc-utf8.patch:
acinclude.m4 | 16 -
edit/edit-widget.h | 16 +
edit/edit.c | 266 +++++++++++++++++++--------
edit/edit.h | 61 ++++--
edit/editcmd.c | 513 +++++++++++++++++++++++++++++++++++++++++++++--------
edit/editdraw.c | 115 ++++++++---
edit/editkeys.c | 29 ++
edit/editwidget.c | 3
edit/wordproc.c | 81 ++++++--
src/achown.c | 6
src/boxes.c | 50 ++---
src/dialog.c | 2
src/file.c | 9
src/filegui.c | 47 ++--
src/find.c | 10 -
src/help.c | 24 ++
src/hotlist.c | 14 -
src/layout.c | 26 +-
src/learn.c | 2
src/main.c | 4
src/menu.c | 123 +++++++++++-
src/menu.h | 2
src/myslang.h | 4
src/option.c | 20 +-
src/panelize.c | 8
src/screen.c | 268 ++++++++++++++++++++-------
src/util.c | 323 ++++++++++++++++++++++++++++++---
src/util.h | 7
src/view.c | 61 +++++-
src/widget.c | 375 +++++++++++++++++++++++++++++++-------
src/widget.h | 16 +
src/wtools.c | 14 -
32 files changed, 2013 insertions(+), 502 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.6 -r 1.7 mc-utf8.patch
Index: mc-utf8.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/FC-4/mc-utf8.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mc-utf8.patch 5 May 2005 07:56:54 -0000 1.6
+++ mc-utf8.patch 16 Jun 2005 13:02:36 -0000 1.7
@@ -1,5 +1,5 @@
---- mc-4.6.1a/edit/editdraw.c.utf8 2005-04-27 23:02:59.000000000 +0200
-+++ mc-4.6.1a/edit/editdraw.c 2005-05-05 09:32:02.694567152 +0200
+--- mc-4.6.1a/edit/editdraw.c.utf8 2005-05-27 05:35:12.000000000 +0200
++++ mc-4.6.1a/edit/editdraw.c 2005-06-06 14:46:19.160253520 +0200
@@ -61,7 +61,7 @@
static void status_string (WEdit * edit, char *s, int w)
@@ -227,9 +227,9 @@
print_to_widget (edit, row, start_col, start_col_real, end_col, line);
}
---- mc-4.6.1a/edit/editkeys.c.utf8 2005-02-22 18:00:38.000000000 +0100
-+++ mc-4.6.1a/edit/editkeys.c 2005-05-05 09:32:02.695567000 +0200
-@@ -177,10 +177,10 @@ static long const common_key_map[] = {
+--- mc-4.6.1a/edit/editkeys.c.utf8 2005-05-27 05:35:12.000000000 +0200
++++ mc-4.6.1a/edit/editkeys.c 2005-06-06 14:46:19.161253368 +0200
+@@ -176,10 +176,10 @@ static long const common_key_map[] = {
* 'command' is one of the editor commands from editcmddef.h.
*/
int
@@ -242,7 +242,7 @@
int i = 0;
static const long *key_map;
-@@ -257,9 +257,30 @@ edit_translate_key (WEdit *edit, long x_
+@@ -256,9 +256,30 @@ edit_translate_key (WEdit *edit, long x_
/* an ordinary insertable character */
if (x_key < 256) {
int c = convert_from_input_c (x_key);
@@ -258,7 +258,7 @@
+
+ edit->charbuf[edit->charpoint++] = c;
+
-+ res = mbrtowc(&wc, edit->charbuf, edit->charpoint, &mbs);
++ res = mbrtowc(&wc, (char *)edit->charbuf, edit->charpoint, &mbs);
+ if (res < 0) {
+ if (res != -2) edit->charpoint = 0; /* broken multibyte char, skip */
+ return 0;
@@ -274,7 +274,7 @@
goto fin;
}
}
-@@ -300,7 +321,7 @@ edit_translate_key (WEdit *edit, long x_
+@@ -299,7 +320,7 @@ edit_translate_key (WEdit *edit, long x_
*cmd = command;
*ch = char_for_insertion;
@@ -283,9 +283,21 @@
/* unchanged, key has no function here */
return 0;
}
---- mc-4.6.1a/edit/wordproc.c.utf8 2005-02-22 18:00:38.000000000 +0100
-+++ mc-4.6.1a/edit/wordproc.c 2005-05-05 09:32:02.696566848 +0200
-@@ -41,7 +41,12 @@
+--- mc-4.6.1a/edit/editwidget.c.utf8 2005-05-27 05:35:12.000000000 +0200
++++ mc-4.6.1a/edit/editwidget.c 2005-06-06 14:46:19.162253216 +0200
+@@ -349,7 +349,8 @@ edit_callback (Widget *w, widget_msg_t m
+
+ case WIDGET_KEY:
+ {
+- int cmd, ch;
++ int cmd;
++ mc_wint_t ch;
+
+ /* first check alt-f, alt-e, alt-s, etc for drop menus */
+ if (edit_drop_hotkey_menu (e, parm))
+--- mc-4.6.1a/edit/wordproc.c.utf8 2005-05-27 05:35:12.000000000 +0200
++++ mc-4.6.1a/edit/wordproc.c 2005-06-06 14:46:19.162253216 +0200
+@@ -40,7 +40,12 @@
#define tab_width option_tab_spacing
@@ -298,7 +310,7 @@
#define FONT_MEAN_WIDTH 1
static long
-@@ -58,14 +63,21 @@ line_start (WEdit *edit, long line)
+@@ -57,14 +62,21 @@ line_start (WEdit *edit, long line)
p = edit_move_forward (edit, p, line - l, 0);
p = edit_bol (edit, p);
@@ -321,7 +333,7 @@
c = edit_get_byte (edit, p);
if (c == '.') { /* `...' is acceptable */
if (edit_get_byte (edit, p + 1) == '.')
-@@ -79,7 +91,13 @@ static int bad_line_start (WEdit * edit,
+@@ -78,7 +90,13 @@ static int bad_line_start (WEdit * edit,
return 0; /* `---' is acceptable */
return 1;
}
@@ -335,7 +347,7 @@
return 1;
return 0;
}
-@@ -132,33 +150,37 @@ end_paragraph (WEdit *edit, int force)
+@@ -131,33 +149,37 @@ end_paragraph (WEdit *edit, int force)
i - edit->curs_line, 0));
}
@@ -381,7 +393,7 @@
while (size--) {
*p = *p == '\n' ? ' ' : *p;
p++;
-@@ -175,7 +197,7 @@ static inline int next_tab_pos (int x)
+@@ -174,7 +196,7 @@ static inline int next_tab_pos (int x)
{
return x += tab_width - x % tab_width;
}
@@ -390,7 +402,7 @@
{
int x = 0, c, xn = 0;
for (;;) {
-@@ -199,7 +221,7 @@ static int line_pixel_length (unsigned c
+@@ -198,7 +220,7 @@ static int line_pixel_length (unsigned c
}
static int
@@ -399,7 +411,7 @@
{
int i;
for (i = q;; i++) {
-@@ -221,13 +243,13 @@ next_word_start (unsigned char *t, int q
+@@ -220,13 +242,13 @@ next_word_start (unsigned char *t, int q
/* find the start of a word */
static int
@@ -415,7 +427,7 @@
if (!i)
return -1;
c = t[i - 1];
-@@ -240,7 +262,7 @@ word_start (unsigned char *t, int q)
+@@ -239,7 +261,7 @@ word_start (unsigned char *t, int q)
}
/* replaces ' ' with '\n' to properly format a paragraph */
@@ -424,7 +436,7 @@
{
int q = 0, ww;
strip_newlines (t, size);
-@@ -268,7 +290,7 @@ static void format_this (unsigned char *
+@@ -267,7 +289,7 @@ static void format_this (unsigned char *
}
}
@@ -433,7 +445,7 @@
{
edit_cursor_move (edit, q - edit->curs1);
edit_delete (edit);
-@@ -277,18 +299,27 @@ static void replace_at (WEdit * edit, lo
+@@ -276,18 +298,27 @@ static void replace_at (WEdit * edit, lo
/* replaces a block of text */
static void
@@ -463,7 +475,7 @@
p++;
} else if (t[i - 1] == '\n') {
long curs;
-@@ -300,7 +331,11 @@ put_paragraph (WEdit * edit, unsigned ch
+@@ -299,7 +330,11 @@ put_paragraph (WEdit * edit, unsigned ch
p = edit->curs1;
} else if (c == '\n') {
edit_cursor_move (edit, p - edit->curs1);
@@ -475,7 +487,7 @@
edit_delete (edit);
if (cursor > edit->curs1)
cursor--;
-@@ -333,7 +368,7 @@ format_paragraph (WEdit *edit, int force
+@@ -332,7 +367,7 @@ format_paragraph (WEdit *edit, int force
{
long p, q;
int size;
@@ -484,7 +496,7 @@
int indent = 0;
if (option_word_wrap_line_length < 2)
return;
-@@ -343,17 +378,25 @@ format_paragraph (WEdit *edit, int force
+@@ -342,17 +377,25 @@ format_paragraph (WEdit *edit, int force
q = end_paragraph (edit, force);
indent = test_indent (edit, p, q);
t = get_paragraph (edit, p, q, indent, &size);
@@ -511,18 +523,18 @@
g_free (t);
return;
}
---- mc-4.6.1a/edit/editcmd.c.utf8 2005-05-04 01:40:15.000000000 +0200
-+++ mc-4.6.1a/edit/editcmd.c 2005-05-05 09:32:02.701566088 +0200
-@@ -60,7 +60,7 @@
+--- mc-4.6.1a/edit/editcmd.c.utf8 2005-05-27 05:35:12.000000000 +0200
++++ mc-4.6.1a/edit/editcmd.c 2005-06-06 14:46:19.166252608 +0200
+@@ -58,7 +58,7 @@
#define edit_get_save_file(f,h) input_expand_dialog (h, _(" Enter file name: "), f)
[...1790 lines suppressed...]
@@ -4551,7 +4563,7 @@
NORMAL_BUTTON, cpname, sel_charset_button));
return dbits_dlg;
-@@ -806,7 +806,7 @@ cd_dialog (void)
+@@ -811,7 +811,7 @@ cd_dialog (void)
quick_widgets [1].y_divisions =
quick_widgets [0].y_divisions = Quick_input.ylen = 5;
@@ -4560,7 +4572,7 @@
quick_widgets [0].relative_x =
quick_widgets [1].relative_x + len + 1;
-@@ -965,7 +965,7 @@ jobs_cmd (void)
+@@ -970,7 +970,7 @@ jobs_cmd (void)
{
job_buttons [i].name = _(job_buttons [i].name);
@@ -4569,7 +4581,7 @@
JOBS_X = max (JOBS_X, startx + len + 3);
job_buttons [i].xpos = startx;
-@@ -974,7 +974,7 @@ jobs_cmd (void)
+@@ -979,7 +979,7 @@ jobs_cmd (void)
/* Last button - Ok a.k.a. Cancel :) */
job_buttons [n_buttons - 1].xpos =
@@ -4578,7 +4590,7 @@
i18n_flag = 1;
}
-@@ -1032,7 +1032,7 @@ vfs_smb_get_authinfo (const char *host,
+@@ -1037,7 +1037,7 @@ vfs_smb_get_authinfo (const char *host,
while (i--)
{
@@ -4587,7 +4599,7 @@
if (l1 > maxlen)
maxlen = l1;
}
-@@ -1042,7 +1042,7 @@ vfs_smb_get_authinfo (const char *host,
+@@ -1047,7 +1047,7 @@ vfs_smb_get_authinfo (const char *host,
for (i = sizeof(buts)/sizeof(buts[0]), l1 = 0; i--; )
{
@@ -4596,7 +4608,7 @@
}
l1 += 15;
if (l1 > dialog_x)
-@@ -1051,7 +1051,7 @@ vfs_smb_get_authinfo (const char *host,
+@@ -1056,7 +1056,7 @@ vfs_smb_get_authinfo (const char *host,
ilen = dialog_x - 7 - maxlen; /* for the case of very long buttons :) */
istart = dialog_x - 3 - ilen;
@@ -4605,8 +4617,8 @@
i18n_flag = 1;
}
---- mc-4.6.1a/src/achown.c.utf8 2005-03-17 23:03:31.000000000 +0100
-+++ mc-4.6.1a/src/achown.c 2005-05-05 09:32:02.743559704 +0200
+--- mc-4.6.1a/src/achown.c.utf8 2005-05-27 05:35:14.000000000 +0200
++++ mc-4.6.1a/src/achown.c 2005-06-06 14:46:19.193248504 +0200
@@ -579,6 +579,12 @@ init_chown_advanced (void)
b_att[2] = button_new (XTRACT (6));
b_user = button_new (XTRACT (5));
@@ -4620,8 +4632,8 @@
add_widget (ch_dlg, b_group);
add_widget (ch_dlg, b_user);
---- mc-4.6.1a/src/menu.c.utf8 2005-02-08 10:04:03.000000000 +0100
-+++ mc-4.6.1a/src/menu.c 2005-05-05 09:32:02.744559552 +0200
+--- mc-4.6.1a/src/menu.c.utf8 2005-05-27 05:35:15.000000000 +0200
++++ mc-4.6.1a/src/menu.c 2005-06-06 14:46:19.194248352 +0200
@@ -22,6 +22,7 @@
#include <string.h>
@@ -4651,10 +4663,10 @@
+ memset (&s, 0, sizeof (s));
+ wlen = mbsrtowcs (NULL, &str, -1, &s);
+ if (wlen > 0)
-+ ++wlen;
++ ++wlen;
+ else {
-+ wlen = 0;
-+ memset (&s, 0, sizeof (s));
++ wlen = 0;
++ memset (&s, 0, sizeof (s));
+ }
+ }
+#endif
@@ -4663,30 +4675,30 @@
register menu_entry* mp;
for (mp = entries; count--; mp++) {
if (mp->text[0] != '\0') {
-+ int len;
++ int len;
#ifdef ENABLE_NLS
mp->text = _(mp->text);
#endif /* ENABLE_NLS */
cp = strchr (mp->text,'&');
+#ifdef UTF8
-+ if (SLsmg_Is_Unicode) {
-+ len = mbstrlen(mp->text) + 1;
-+ wlen += len;
-+ menu->max_entry_len = max (len - 1, menu->max_entry_len);
-+ } else
++ if (SLsmg_Is_Unicode) {
++ len = mbstrlen(mp->text) + 1;
++ wlen += len;
++ menu->max_entry_len = max (len - 1, menu->max_entry_len);
++ } else
+#endif
-+ len = strlen (mp->text);
++ len = strlen (mp->text);
+
if (cp != NULL && *(cp+1) != '\0') {
- mp->hot_key = tolower (*(cp+1));
+ mp->hot_key = tolower ((unsigned char) *(cp+1));
- menu->max_entry_len = max ((int) (strlen (mp->text) - 1),
- menu->max_entry_len);
-+ menu->max_entry_len = max (len - 1, menu->max_entry_len);
++ menu->max_entry_len = max (len - 1, menu->max_entry_len);
} else {
- menu->max_entry_len = max ((int) strlen (mp->text),
- menu->max_entry_len);
-+ menu->max_entry_len = max (len, menu->max_entry_len);
++ menu->max_entry_len = max (len, menu->max_entry_len);
}
}
}
@@ -4732,7 +4744,7 @@
menu_scan_hotkey(menu);
menu->start_x = 0;
@@ -112,8 +176,26 @@ static void menubar_paint_idx (WMenu *me
- const unsigned char *text;
+ const char *text;
addch((unsigned char)menu->entries [idx].first_letter);
- for (text = menu->entries [idx].text; *text; text++)
@@ -4784,7 +4796,7 @@
}
if (menubar->dropped)
-@@ -492,7 +580,13 @@ menubar_arrange(WMenu* menubar)
+@@ -495,7 +583,13 @@ menubar_arrange(WMenu* menubar)
for (i = 0; i < items; i++)
{
@@ -4799,7 +4811,7 @@
menubar->menu[i]->start_x = start_x;
start_x += len + gap;
}
-@@ -505,7 +599,13 @@ menubar_arrange(WMenu* menubar)
+@@ -508,7 +602,13 @@ menubar_arrange(WMenu* menubar)
for (i = 0; i < items; i++)
{
/* preserve length here, to be used below */
@@ -4814,7 +4826,7 @@
}
gap /= (items - 1);
-@@ -529,6 +629,9 @@ menubar_arrange(WMenu* menubar)
+@@ -532,6 +632,9 @@ menubar_arrange(WMenu* menubar)
void
destroy_menu (Menu *menu)
{
@@ -4824,8 +4836,8 @@
g_free (menu->name);
g_free (menu->help_node);
g_free (menu);
---- mc-4.6.1a/src/option.c.utf8 2005-02-08 10:04:03.000000000 +0100
-+++ mc-4.6.1a/src/option.c 2005-05-05 09:32:02.745559400 +0200
+--- mc-4.6.1a/src/option.c.utf8 2005-05-27 05:35:15.000000000 +0200
++++ mc-4.6.1a/src/option.c 2005-06-06 14:46:19.195248200 +0200
@@ -123,12 +123,12 @@ init_configure (void)
title2 = _(" Pause after run... ");
title3 = _(" Other options ");
@@ -4873,8 +4885,8 @@
i18n_config_flag = 1;
}
---- mc-4.6.1a/src/filegui.c.utf8 2005-02-08 10:04:03.000000000 +0100
-+++ mc-4.6.1a/src/filegui.c 2005-05-05 09:32:02.746559248 +0200
+--- mc-4.6.1a/src/filegui.c.utf8 2005-05-27 05:35:15.000000000 +0200
++++ mc-4.6.1a/src/filegui.c 2005-06-06 14:46:19.196248048 +0200
@@ -65,6 +65,7 @@
#include "filegui.h"
#include "key.h" /* get_event */
@@ -5020,8 +5032,8 @@
+ g_free(def_text);
return dest_dir;
}
---- mc-4.6.1a/acinclude.m4.utf8 2005-04-26 19:29:58.000000000 +0200
-+++ mc-4.6.1a/acinclude.m4 2005-05-05 09:32:02.747559096 +0200
+--- mc-4.6.1a/acinclude.m4.utf8 2005-05-11 23:56:57.000000000 +0200
++++ mc-4.6.1a/acinclude.m4 2005-06-06 14:46:19.197247896 +0200
@@ -769,14 +769,14 @@ AC_DEFUN([MC_WITH_SLANG], [
fi
Index: mc.spec
===================================================================
RCS file: /cvs/dist/rpms/mc/FC-4/mc.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- mc.spec 5 May 2005 07:56:54 -0000 1.54
+++ mc.spec 16 Jun 2005 13:02:36 -0000 1.55
@@ -1,12 +1,12 @@
Summary: User-friendly text console file manager and visual shell.
Name: mc
Version: 4.6.1a
-Release: 0.9
+Release: 0.10.FC4
Epoch: 1
License: GPL
Group: System Environment/Shells
#Source0: http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/mc-%{version}.tar.gz
-%define date 20050504
+%define date 20050606
Source0: mc-%{version}-%{date}.tar.bz2
URL: http://www.ibiblio.org/mc/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -19,9 +19,8 @@
Patch2: mc-promptfix.patch
Patch3: mc-uglydir.patch
Patch4: mc-fish-upload.patch
-Patch5: mc-spaceprompt.patch
-Patch6: mc-userhost.patch
-Patch7: mc-64bit.patch
+Patch5: mc-userhost.patch
+Patch6: mc-64bit.patch
%description
Midnight Commander is a visual shell much like a file manager, only
@@ -38,9 +37,8 @@
%patch2 -p1 -b .promptfix
%patch3 -p1 -b .uglydir
%patch4 -p1 -b .fish-upload
-%patch5 -p1 -b .spaceprompt
-%patch6 -p1 -b .userhost
-%patch7 -p1 -b .64bit
+%patch5 -p1 -b .userhost
+%patch6 -p1 -b .64bit
# convert files in /lib to UTF-8
pushd lib
@@ -174,6 +172,11 @@
%dir %{_datadir}/mc
%changelog
+* Thu Jun 16 2005 Jindrich Novy <jnovy at redhat.com> 4.6.11-0.10.FC4
+- update to more recent mc version to fix problems with dislaying
+ sizes of files larger than 2GB (#160295)
+- drop spaceprompt patch - applied in newer version
+
* Thu May 04 2005 Jindrich Novy <jnovy at redhat.com> 4.6.1a-0.9
- update from CVS
- sync with .utf8 patch
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mc/FC-4/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources 5 May 2005 08:03:22 -0000 1.21
+++ sources 16 Jun 2005 13:02:36 -0000 1.22
@@ -1 +1 @@
-0b513e4ddd5ac05d7ab444b6465f92d9 mc-4.6.1a-20050504.tar.bz2
+4d84248d7aa985aee2ecaf89e1b779cc mc-4.6.1a-20050606.tar.bz2
--- mc-spaceprompt.patch DELETED ---
More information about the fedora-cvs-commits
mailing list