Hello community, here is the log from the commit of package mc checked in at Mon Oct 9 11:39:34 CEST 2006. -------- --- GNOME/mc/mc.changes 2006-06-07 12:32:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/mc/mc.changes 2006-10-04 15:37:20.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Oct 4 15:34:51 CEST 2006 - nadvornik@suse.cz + +- built with --with-samba [#207643] +- fixed displaying of nlink column in utf8 mode [#194715] +- spec file cleanup [#194392] + +------------------------------------------------------------------- New: ---- mc-utf8-nlink.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mc.spec ++++++ --- /var/tmp/diff_new_pack.nTe2Y0/_old 2006-10-09 11:33:42.000000000 +0200 +++ /var/tmp/diff_new_pack.nTe2Y0/_new 2006-10-09 11:33:42.000000000 +0200 @@ -18,7 +18,7 @@ PreReq: permissions Autoreqprov: on Version: 4.6.1 -Release: 34 +Release: 42 Summary: Midnight Commander Source: mc-4.6.1.tar.bz2 Source1: x11_browser @@ -49,6 +49,7 @@ Patch26: mc-4.6.1-long-panel.patch Patch27: mc-4.6.1-getpwuid.patch Patch28: mc-4.6.1-syntax-hpp.patch +Patch29: mc-utf8-nlink.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: http://www.ibiblio.org/mc/ @@ -137,10 +138,10 @@ %patch26 %patch27 %patch28 -pushd $RPM_BUILD_DIR/mc*/po/ +%patch29 +cd po rename no nb no.* -popd -cd lib +cd ../lib iconv -f iso8859-1 -t utf-8 -o mc.hint.tmp mc.hint && mv mc.hint.tmp mc.hint iconv -f iso8859-1 -t utf-8 -o mc.hint.es.tmp mc.hint.es && mv mc.hint.es.tmp mc.hint.es iconv -f iso8859-1 -t utf-8 -o mc.hint.it.tmp mc.hint.it && mv mc.hint.it.tmp mc.hint.it @@ -190,7 +191,8 @@ --prefix=%{_prefix} \ --localstatedir=/var/lib \ --libdir=%{_libdir} \ - --enable-charset + --enable-charset \ + --with-samba make %install @@ -233,6 +235,10 @@ %{_datadir}/mc %changelog -n mc +* Wed Oct 04 2006 - nadvornik@suse.cz +- built with --with-samba [#207643] +- fixed displaying of nlink column in utf8 mode [#194715] +- spec file cleanup [#194392] * Wed Jun 07 2006 - nadvornik@suse.cz - fixes for Slang2 [#177920, #176327] * Tue Apr 18 2006 - schwab@suse.de ++++++ mc-4.6.1-NULL.patch ++++++ --- /var/tmp/diff_new_pack.nTe2Y0/_old 2006-10-09 11:33:43.000000000 +0200 +++ /var/tmp/diff_new_pack.nTe2Y0/_new 2006-10-09 11:33:43.000000000 +0200 @@ -1,11 +1,44 @@ ---- mc-4.6.1-pre3/vfs/ftpfs.c.xx 2005-01-24 09:59:01.155263187 +0100 -+++ mc-4.6.1-pre3/vfs/ftpfs.c 2005-01-24 09:59:14.058520579 +0100 +--- mc-4.6.1/src/cmd.c ++++ mc-4.6.1/src/cmd.c +@@ -1209,7 +1209,7 @@ + sync_profiles (); + str = g_strconcat ( _(" Setup saved to ~/"), PROFILE_NAME, (char *) NULL); + +- message (0, _(" Setup "), str); ++ message (0, _(" Setup "), "%s", str); + g_free (str); + } + +--- mc-4.6.1/src/hotlist.c ++++ mc-4.6.1/src/hotlist.c +@@ -1427,7 +1427,7 @@ + msg = g_strconcat (_("MC was unable to write ~/"), HOTLIST_FILENAME, + _(" file, your old hotlist entries were not deleted"), (char *) NULL); + +- message (D_ERROR, _(" Hotlist Load "), msg); ++ message (D_ERROR, _(" Hotlist Load "), "%s", msg); + g_free (msg); + } + } else { +--- mc-4.6.1/vfs/ftpfs.c ++++ mc-4.6.1/vfs/ftpfs.c @@ -829,7 +829,7 @@ /* If the remote server is an Amiga a leading slash might be missing. MC needs it because it is used as separator between hostname and path internally. */ - return g_strconcat( "/", bufp, 0); -+ return g_strconcat( "/", bufp, NULL); ++ return g_strconcat( "/", bufp, (char *) NULL); } } else { ftpfs_errno = EIO; +--- mc-4.6.1/vfs/smbfs.c ++++ mc-4.6.1/vfs/smbfs.c +@@ -546,7 +546,7 @@ + if (p) + my_remote = p; /* strip off share/service name */ + /* create remote filename as understood by smb clientgen */ +- result = g_strconcat (my_remote, trailing_asterik ? "/*" : "", 0); ++ result = g_strconcat (my_remote, trailing_asterik ? "/*" : "", (char *) NULL); + unix_to_dos (result, /* inplace = */ 1); /* code page conversion */ + str_replace(result, '/', '\\'); + return result; ++++++ mc-4.6.1-long-panel.patch ++++++ --- /var/tmp/diff_new_pack.nTe2Y0/_old 2006-10-09 11:33:43.000000000 +0200 +++ /var/tmp/diff_new_pack.nTe2Y0/_new 2006-10-09 11:33:43.000000000 +0200 @@ -1,15 +1,12 @@ Index: src/screen.c -=================================================================== -RCS file: /cvsroot/mc/mc/src/screen.c,v -retrieving revision 1.219 -diff -u -p -r1.219 screen.c ---- src/screen.c 11 Nov 2005 03:32:40 -0000 1.219 -+++ src/screen.c 6 Feb 2006 18:10:31 -0000 -@@ -2257,6 +2257,7 @@ panel_callback (Widget *w, widget_msg_t +================================================================================ +--- src/screen.c ++++ src/screen.c +@@ -2358,6 +2358,7 @@ select_item (panel); show_dir (panel); paint_dir (panel); + panel->dirty = 0; - buttonbar_set_label (h, 1, _("Help"), help_cmd); - buttonbar_set_label (h, 2, _("Menu"), user_file_menu_cmd); + define_label (h, 1, _("Help"), help_cmd); + define_label (h, 2, _("Menu"), user_file_menu_cmd); ++++++ mc-utf8-nlink.patch ++++++ --- src/screen.c +++ src/screen.c @@ -646,7 +646,7 @@ SLsmg_write_nwchars (((wchar_t *) buffer) + txtlen - n2, n2); } else - SLsmg_write_nwchars ((wchar_t *) buffer, len); + SLsmg_write_nwchars ((wchar_t *) buffer + still, len); } else { printw ("%*s", still, ""); SLsmg_write_nwchars ((wchar_t *) buffer, txtlen); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org