Home | Content | Search | Navigation | Indexes
 

Mailinglist Archive: opensuse-commit (857 mails)

< Previous Next >
commit mc
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Tue, 06 Nov 2007 00:30:47 +0100
  • Message-id: <20071105233048.29312678168@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package mc
checked in at Tue Nov 6 00:30:47 CET 2007.

--------
--- GNOME/mc/mc.changes 2007-08-28 16:38:18.000000000 +0200
+++ /mounts/work_src_done/STABLE/mc/mc.changes 2007-11-05 13:41:01.000000000
+0100
@@ -1,0 +2,10 @@
+Mon Nov 5 13:31:25 CET 2007 - nadvornik@xxxxxxx
+
+- updated to 4.6.2-pre1
+ * improved subshell handling
+ * improved fish filesystem
+ * a lot of other fixes and enhancements
+- updated UTF-8 patches using Fedora package
+- added support for weak rpm dependencies in VFS
+
+-------------------------------------------------------------------

Old:
----
00-72-utf8-dialog-title.patch
00-74-utf8-dialog-filename-truncate.patch
00-78-utf8-filename-search-input.patch
00-80-utf8-help-line-drawing-art.patch
mc-4.6.1-apps.patch
mc-4.6.1-bash-all.patch
mc-4.6.1-esc-seq.patch
mc-4.6.1-getpwuid.patch
mc-4.6.1-long-panel.patch
mc-4.6.1-no-nb.diff
mc-4.6.1-NULL.patch
mc-4.6.1-palmsupport.patch
mc-4.6.1-syntax-hpp.patch
mc-4.6.1.tar.bz2
mc-4.6.1-unrar-passwd.patch
mc-4.6.1-word_docs.patch
mc-4.6.1-wrapper.patch
mc-4.6.1-x11browser.diff
mc-CVS-msglen.patch
mc-CVS-utf8-fix.patch
mc-CVS-utf8-help.patch
mc-CVS-utf8-hint.patch
mc-CVS-utf8-input.patch
mc-CVS-utf8.patch
mc.umode_t.patch
mc-utf8-slang2.patch
mc.vfs_dirent-offsetof.patch

New:
----
mc-4.6.2-pre1.tar.bz2
mc-apps.patch
mc-esc-seq.patch
mc-getpwuid.patch
mc-no-nb.diff
mc-NULL.patch
mc-palmsupport.patch
mc-rpm.patch
mc-syntax-hpp.patch
mc-utf8.patch
mc-word_docs.patch
mc-wrapper.patch
mc-x11browser.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ mc.spec ++++++
--- /var/tmp/diff_new_pack.w13801/_old 2007-11-06 00:29:41.000000000 +0100
+++ /var/tmp/diff_new_pack.w13801/_new 2007-11-06 00:29:41.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package mc (Version 4.6.1)
+# spec file for package mc (Version 4.6.2.pre1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,46 +16,32 @@
License: GPL v2 or later
Group: Productivity/File utilities
PreReq: permissions
-Autoreqprov: on
-Version: 4.6.1
-Release: 127
+AutoReqProv: on
+Version: 4.6.2.pre1
+Release: 1
Summary: Midnight Commander
-Source: mc-4.6.1.tar.bz2
+Source: mc-4.6.2-pre1.tar.bz2
Source1: x11_browser
-Patch1: mc-CVS-utf8.patch
-Patch2: mc-CVS-utf8-fix.patch
-Patch3: mc-CVS-utf8-input.patch
-Patch4: mc-CVS-utf8-hint.patch
-Patch5: mc-CVS-utf8-help.patch
-Patch6: mc-CVS-msglen.patch
-Patch7: 00-70-utf8-common.patch
-Patch8: 00-72-utf8-dialog-title.patch
-Patch9: 00-73-utf8-bottom-buttons-width.patch
-Patch10: 00-74-utf8-dialog-filename-truncate.patch
-Patch11: 00-75-utf8-cmdline-help.patch
-Patch12: 00-76-utf8-hotlist-highlight.patch
-Patch13: 00-77-utf8-filename-search-highlight.patch
-Patch14: 00-78-utf8-filename-search-input.patch
-Patch15: 00-80-utf8-help-line-drawing-art.patch
-Patch16: mc-4.6.1-apps.patch
-Patch18: mc-4.6.1-palmsupport.patch
-Patch19: mc-4.6.1-word_docs.patch
-Patch20: mc-4.6.1-x11browser.diff
-Patch21: mc-4.6.1-no-nb.diff
-Patch22: mc-4.6.1-unrar-passwd.patch
-Patch23: mc-4.6.1-NULL.patch
-Patch24: mc-utf8-slang2.patch
-Patch25: mc-4.6.1-wrapper.patch
-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
-Patch30: mc-4.6.1-bash-all.patch
-Patch31: mc-4.6.1-esc-seq.patch
-Patch32: mc.umode_t.patch
-Patch33: mc.vfs_dirent-offsetof.patch
+Patch0: mc-utf8.patch
+Patch1: 00-70-utf8-common.patch
+Patch2: 00-73-utf8-bottom-buttons-width.patch
+Patch3: 00-75-utf8-cmdline-help.patch
+Patch4: 00-76-utf8-hotlist-highlight.patch
+Patch5: 00-77-utf8-filename-search-highlight.patch
+Patch6: mc-apps.patch
+Patch7: mc-palmsupport.patch
+Patch8: mc-word_docs.patch
+Patch9: mc-x11browser.diff
+Patch10: mc-no-nb.diff
+Patch11: mc-NULL.patch
+Patch12: mc-wrapper.patch
+Patch13: mc-getpwuid.patch
+Patch14: mc-syntax-hpp.patch
+Patch15: mc-utf8-nlink.patch
+Patch16: mc-esc-seq.patch
+Patch17: mc-rpm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-URL: http://www.ibiblio.org/mc/
+Url: http://www.ibiblio.org/mc/
Requires: %{name}-lang = %{version}

%description
@@ -116,39 +102,25 @@
%define INSTALL_DATA install -m644
%lang_package
%prep
-%setup -q
+%setup -q -n mc-4.6.2-pre1
+%patch0 -p 1
%patch1 -p 1
%patch2 -p 1
%patch3 -p 1
%patch4 -p 1
%patch5 -p 1
-%patch6 -p 1
+%patch6
%patch7 -p 1
-%patch8 -p 1
-%patch9 -p 1
-%patch10 -p 1
+%patch8
+%patch9
+%patch10
%patch11 -p 1
-%patch12 -p 1
-%patch13 -p 1
-%patch14 -p 1
-%patch15 -p 1
+%patch12
+%patch13
+%patch14
+%patch15
%patch16
-%patch18 -p 1
-%patch19
-%patch20
-%patch21
-%patch22
-%patch23 -p 1
-%patch24
-%patch25
-%patch26
-%patch27
-%patch28
-%patch29
-%patch30
-%patch31
-%patch32 -p1
-%patch33 -p1
+%patch17

%build
pushd po
@@ -166,7 +138,6 @@
iconv -f koi8-u -t utf8 -o mc.hint.uk.tmp mc.hint.uk && mv mc.hint.uk.tmp
mc.hint.uk
iconv -f big5 -t utf8 -o mc.hint.zh.tmp mc.hint.zh && mv mc.hint.zh.tmp
mc.hint.zh
popd
-
# convert docs to utf-8
pushd doc
pushd es
@@ -203,6 +174,7 @@
--mandir=%{_mandir} \
--prefix=%{_prefix} \
--localstatedir=/var/lib \
+ --libexecdir=%{_libdir} \
--libdir=%{_libdir} \
--enable-charset \
--with-samba
@@ -220,7 +192,6 @@
#support script for calling available GUI webbrosers
install -m 755 %{SOURCE1} %{buildroot}/usr/share/mc/bin
%{find_lang} %{name}
-
%fdupes -s $RPM_BUILD_ROOT/usr

%clean
@@ -228,7 +199,6 @@

%post
%run_permissions
-
%verifyscript
%verify_permissions -e /usr/lib/mc/cons.saver

@@ -250,8 +220,14 @@
%{_datadir}/mc

%files lang -f %{name}.lang
-
%changelog
+* Mon Nov 05 2007 - nadvornik@xxxxxxx
+- updated to 4.6.2-pre1
+ * improved subshell handling
+ * improved fish filesystem
+ * a lot of other fixes and enhancements
+- updated UTF-8 patches using Fedora package
+- added support for weak rpm dependencies in VFS
* Tue Aug 28 2007 - nadvornik@xxxxxxx
- link duplicate files only inside /usr [#304167]
* Sat Aug 11 2007 - olh@xxxxxxx

++++++ 00-70-utf8-common.patch ++++++
--- /var/tmp/diff_new_pack.w13801/_old 2007-11-06 00:29:41.000000000 +0100
+++ /var/tmp/diff_new_pack.w13801/_new 2007-11-06 00:29:41.000000000 +0100
@@ -1,9 +1,9 @@
Some common stuff used by other UTF-8 patches.


================================================================================
---- mc-4.6.1-pre2b/src/util.c
-+++ mc-4.6.1-pre2b/src/util.c
-@@ -144,6 +144,30 @@
+--- mc-4.6.2-pre1/src/util.c
++++ mc-4.6.2-pre1/src/util.c
+@@ -140,6 +140,30 @@
return strlen (str);
}

@@ -34,12 +34,12 @@
#ifdef UTF8

void
---- mc-4.6.1-pre2b/src/util.h
-+++ mc-4.6.1-pre2b/src/util.h
-@@ -95,6 +95,7 @@
+--- mc-4.6.2-pre1/src/util.h
++++ mc-4.6.2-pre1/src/util.h
+@@ -105,6 +105,7 @@

void fix_utf8(char *str);
- int mbstrlen (const char *);
+ size_t mbstrlen (const char *);
+int columns_to_bytes (const char *, int);
wchar_t *mbstr_to_wchar (const char *);
char *wchar_to_mbstr (const wchar_t *);

++++++ 00-73-utf8-bottom-buttons-width.patch ++++++
--- /var/tmp/diff_new_pack.w13801/_old 2007-11-06 00:29:41.000000000 +0100
+++ /var/tmp/diff_new_pack.w13801/_new 2007-11-06 00:29:41.000000000 +0100
@@ -1,21 +1,21 @@
Use six character width cyan rectangles for bottom row's buttons.


================================================================================
---- mc-4.6.1-pre2b/src/widget.c
-+++ mc-4.6.1-pre2b/src/widget.c
-@@ -2481,11 +2481,14 @@
+--- mc-4.6.2-pre1/src/widget.c
++++ mc-4.6.2-pre1/src/widget.c
+@@ -2549,11 +2549,14 @@
attrset (DEFAULT_COLOR);
- printw ("%-*s", bb->widget.cols, "");
+ tty_printf ("%-*s", bb->widget.cols, "");
for (i = 0; i < COLS / 8 && i < 10; i++) {
+ int j;
widget_move (&bb->widget, 0, i * 8);
attrset (DEFAULT_COLOR);
- printw ("%d", i + 1);
+ tty_printf ("%d", i + 1);
attrset (SELECTED_COLOR);
-- printw ("%-*s", ((i + 1) * 8 == COLS ? 5 : 6),
+- tty_printf ("%-*s", ((i + 1) * 8 == COLS ? 5 : 6),
+ j = columns_to_bytes(bb->labels [i].text ? bb->labels [i].text : "",
+ ((i + 1) * 8 == COLS ? 5 : 6));
-+ printw ("%-*s", j,
++ tty_printf ("%-*s", j,
bb->labels[i].text ? bb->labels[i].text : "");
attrset (DEFAULT_COLOR);
}

++++++ 00-75-utf8-cmdline-help.patch ++++++
--- /var/tmp/diff_new_pack.w13801/_old 2007-11-06 00:29:41.000000000 +0100
+++ /var/tmp/diff_new_pack.w13801/_new 2007-11-06 00:29:41.000000000 +0100
@@ -1,9 +1,9 @@
Fix formatting the output of "mc --help".


================================================================================
---- mc-4.6.1-pre2b/src/main.c
-+++ mc-4.6.1-pre2b/src/main.c
-@@ -1857,7 +1857,7 @@
+--- mc-4.6.2-pre1/src/main.c
++++ mc-4.6.2-pre1/src/main.c
+@@ -1859,7 +1859,7 @@

/* print help for options */
leftColWidth = poptPrintHelp (ctx, stream, 0);
@@ -12,9 +12,9 @@
_("Set initial line number for the internal editor"));
fputs (_
("\n"
---- mc-4.6.1-pre2b/src/popthelp.c
-+++ mc-4.6.1-pre2b/src/popthelp.c
-@@ -93,7 +93,7 @@
+--- mc-4.6.2-pre1/src/popthelp.c
++++ mc-4.6.2-pre1/src/popthelp.c
+@@ -101,7 +101,7 @@
goto out;
}

@@ -22,17 +22,17 @@
+ helpLength = mbstrlen(help);
while (helpLength > lineLength) {
ch = help + lineLength - 1;
- while (ch > help && !isspace(*ch)) ch--;
-@@ -104,7 +104,7 @@
+ while (ch > help && !isspace((unsigned char) *ch)) ch--;
+@@ -112,7 +112,7 @@
fprintf(f, "%.*s\n%*s", (int) (ch - help), help, indentLength, " ");
help = ch;
- while (isspace(*help) && *help) help++;
+ while (isspace((unsigned char) *help) && *help) help++;
- helpLength = strlen(help);
+ helpLength = mbstrlen(help);
}

if (helpLength) fprintf(f, "%s\n", help);
-@@ -223,7 +223,7 @@
+@@ -233,7 +233,7 @@
if (len == 3) return cursor;

if (argDescrip)
@@ -41,7 +41,7 @@

if ((cursor + len) > 79) {
fprintf(f, "\n ");
-@@ -292,7 +292,7 @@
+@@ -304,7 +304,7 @@
singleTableUsage(f, cursor, con->options, NULL);

if (con->otherHelp) {
@@ -50,14 +50,14 @@
if (cursor > 79) fprintf(f, "\n ");
fprintf(f, " %s", con->otherHelp);
}
---- mc-4.6.1-pre2b/src/util.c
-+++ mc-4.6.1-pre2b/src/util.c
-@@ -127,7 +127,7 @@
- mbstrlen (const char *str)
- {
+--- mc-4.6.2-pre1/src/util.c
++++ mc-4.6.2-pre1/src/util.c
+@@ -147,7 +147,7 @@
+ int columns = 0;
+ int i;
#ifdef UTF8
- if (SLsmg_Is_Unicode) {
+ if (1) {
static mbstate_t s;
- int len;
- const char *str0 = str;
+ while (columns < col) {
+ memset (&s, 0, sizeof (s));

++++++ 00-76-utf8-hotlist-highlight.patch ++++++
--- /var/tmp/diff_new_pack.w13801/_old 2007-11-06 00:29:41.000000000 +0100
+++ /var/tmp/diff_new_pack.w13801/_new 2007-11-06 00:29:41.000000000 +0100
@@ -1,23 +1,23 @@
Highlight the lines of hotlist in full width.


================================================================================
---- mc-4.6.1-pre2b/src/widget.c
-+++ mc-4.6.1-pre2b/src/widget.c
-@@ -1935,6 +1935,7 @@
+--- mc-4.6.2-pre1/src/widget.c
++++ mc-4.6.2-pre1/src/widget.c
+@@ -1995,6 +1995,7 @@
{
WLEntry *e;
int i;
+ int j;
int sel_line;
Dlg_head *h = l->widget.parent;
- int normalc = NORMALC;
-@@ -1965,7 +1966,8 @@
+ int normalc = DLG_NORMALC (h);
+@@ -2025,7 +2026,8 @@
text = e->text;
e = e->next;
}
-- printw (" %-*s ", l->width-2, name_trunc (text, l->width-2));
+- tty_printf (" %-*s ", l->width-2, name_trunc (text, l->width-2));
+ j = columns_to_bytes (name_trunc (text, l->width-2), l->width-2);
-+ printw (" %-*s ", j, name_trunc (text, l->width-2));
++ tty_printf (" %-*s ", j, name_trunc (text, l->width-2));
}
l->cursor_y = sel_line;
if (!l->scrollbar)

++++++ 00-77-utf8-filename-search-highlight.patch ++++++
--- /var/tmp/diff_new_pack.w13801/_old 2007-11-06 00:29:41.000000000 +0100
+++ /var/tmp/diff_new_pack.w13801/_new 2007-11-06 00:29:41.000000000 +0100
@@ -1,17 +1,17 @@
Quick filename search (^S) highlights correct width.


================================================================================
---- mc-4.6.1-pre2b/src/screen.c
-+++ mc-4.6.1-pre2b/src/screen.c
-@@ -746,8 +746,10 @@
+--- mc-4.6.2-pre1/src/screen.c
++++ mc-4.6.2-pre1/src/screen.c
+@@ -769,8 +769,10 @@
widget_move (&panel->widget, llines (panel)+3, 1);

if (panel->searching){
+ int j;
attrset (INPUT_COLOR);
-- printw ("/%-*s", panel->widget.cols-3, panel->search_buffer);
+- tty_printf ("/%-*s", panel->widget.cols-3, panel->search_buffer);
+ j = columns_to_bytes (panel->search_buffer, panel->widget.cols-3);
-+ printw ("/%-*s", j, panel->search_buffer);
++ tty_printf ("/%-*s", j, panel->search_buffer);
attrset (NORMAL_COLOR);
return;
}

++++++ mc-4.6.1-apps.patch -> mc-apps.patch ++++++
--- GNOME/mc/mc-4.6.1-apps.patch 2006-04-07 12:25:54.000000000 +0200
+++ /mounts/work_src_done/STABLE/mc/mc-apps.patch 2007-10-31
15:58:35.000000000 +0100
@@ -9,7 +9,7 @@
Open=%cd %p#utar
View=%view{ascii} bzip2 -dc %f 2>/dev/null | tar tvvf -

-@@ -168,7 +168,7 @@
+@@ -173,7 +173,7 @@
View=%view{ascii} cpio -itv <'%f' 2>/dev/null

# ls-lR
@@ -18,7 +18,7 @@
Open=%cd %p#lslR

# patch
-@@ -324,7 +324,7 @@
+@@ -339,7 +339,7 @@
View=sxpm %f

include/image
@@ -27,30 +27,21 @@
View=%view{ascii} identify %f
#View=%view{ascii} asciiview %f

-@@ -342,11 +342,11 @@
+@@ -357,11 +357,11 @@
Open=vplay -s 22 %f

regex/\.([mM][pP]3)$
-- Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f &); fi
+- Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f >/dev/null
2>&1 &); fi
+ Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else if [ -z "`which
realplay`" ]; then (xmms -e %f 1>/dev/null 2>&1 &); else (realplay %f
/dev/null 2>&1 &); fi; fi
View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n
'/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'

regex/\.([oO][gG][gG])$
-- Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f &); fi
+- Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null
2>&1 &); fi
+ Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms -e %f
/dev/null 2>&1 &); fi
View=%view{ascii} ogginfo %s

regex/\.([mM][iI][dD][iI]?|[rR][mM][iI][dD]?)$
-@@ -360,7 +360,7 @@
- ### Play lists ###
-
- regex/\.([mM]3[uU]|[pP][lL][sS])$
-- Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else
(xmms -p %f &); fi
-+ Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else
(xmms -p %f >/dev/null 2>&1 &); fi
-
-
- ### Video ###
-@@ -402,12 +402,12 @@
+@@ -417,12 +417,12 @@

# Postscript
type/^PostScript
@@ -65,7 +56,7 @@
#Open=(acroread %f &)
#Open=(ghostview %f &)
View=%view{ascii} pdftotext %f -
-@@ -422,54 +422,53 @@
+@@ -437,54 +437,53 @@

# StarOffice 5.2
shell/.sdw

++++++ mc-esc-seq.patch ++++++
--- src/util.c
+++ src/util.c
@@ -1193,6 +1193,8 @@
/* strchr() matches trailing binary 0 */
while (*(++r) && strchr ("0123456789;?", *r));
}
+ else if (*r == '(')
+ r++;

/*
* Now we are at the last character of the sequence.
++++++ mc-getpwuid.patch ++++++
--- edit/editlock.c
+++ edit/editlock.c
@@ -69,9 +69,11 @@
lock_build_name (void)
{
char host[BUF_SIZE];
- const char *user;
+ const char *user = NULL;
+ struct passwd *pw;

- user = getpwuid (getuid ())->pw_name;
+ pw = getpwuid (getuid ());
+ if (pw) user = pw->pw_name;
if (!user) user = getenv ("USER");
if (!user) user = getenv ("USERNAME");
if (!user) user = getenv ("LOGNAME");
++++++ mc-no-nb.diff ++++++
--- po/LINGUAS
+++ po/LINGUAS
@@ -1,3 +1,3 @@
# List of available translations.
-az be bg ca cs da de el es eu fi fr hu it ja ko lt lv mn nl no pl
+az be bg ca cs da de el es eu fi fr hu it ja ko lt lv mn nl nb pl
pt pt_BR ro ru sk sl sr sv ta tr uk vi wa zh_CN zh_TW
++++++ mc-NULL.patch ++++++
--- mc-4.6.2-pre1/src/cmd.c
+++ mc-4.6.2-pre1/src/cmd.c
@@ -1229,7 +1229,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.2-pre1/src/hotlist.c
+++ mc-4.6.2-pre1/src/hotlist.c
@@ -1475,7 +1475,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.2-pre1/vfs/smbfs.c
+++ mc-4.6.2-pre1/vfs/smbfs.c
@@ -566,7 +566,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-palmsupport.patch ++++++
--- mc-4.6.2-pre1/lib/mc.menu
+++ mc-4.6.2-pre1/lib/mc.menu
@@ -186,6 +186,33 @@
fi
echo "Please test the output file before deleting anything"

++ & t r & ! t t
+m Install as MEMO on palm pilot
+ echo "Installing MEMO..."
+ install-memo %f
+
+=+ f \.pdb$ | f \.prc$ | f \.pqa$ | f \.PDB$ | f \.PRC$ | f \.PQA$ & t r & ! t
t
+p Install on palm pilot (programs or databases)
+ echo "Installing file on PALM"
+ pilot-xfer -i %f
+
++ t t
+M Install tagged files as MEMOs on palm pilot
+ for i in %t
+ do
+ echo "Installing MEMO: $i"
+ done
+ install-memo -t %t
+
++ t t
+P Install tagged files on palm pilot (programs or databases)
+ echo "Installing files on PALM"
+ for i in %t
+ do
+ echo "Installing file: $i"
+ done
+ pilot-xfer -i %t
+
=+ f \.tar\.gz$ | f \.tar\.z$ | f \.tgz$ | f \.tpz$ | f \.tar\.Z$| f
\.tar\.bz2$ & t r
x Extract the contents of a compressed tar file
unset EXT
++++++ mc-rpm.patch ++++++
--- syntax/spec.syntax
+++ syntax/spec.syntax
@@ -11,6 +11,7 @@
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,16 +28,19 @@
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
keyword whole Root: green
keyword whole Serial: white
keyword whole Source\[0123456789\]: green
+ keyword whole Suggests: green
keyword whole Summary: green
keyword whole Summary(\[abcdefghijklmnopqrstuvwxyz\]): green
keyword whole
Summary(\[abcdefghijklmnopqrstuvwxyz\]_\[ABCDEFGHIJKLMNOPQRSTUVWXYZ\]): green
keyword whole
Summary(\[abcdefghijklmnopqrstuvwxyz\]_\[ABCDEFGHIJKLMNOPQRSTUVWXYZ\].\[ABCDEFGHIJKLMNOPQRSTUVWXYZ-1234567890\]):
green
+ keyword whole Supplements: green
keyword whole Vendor: green
keyword whole Version: green
keyword whole U\{Rr\}\{Ll\}: green
--- vfs/extfs/rpm
+++ vfs/extfs/rpm
@@ -118,6 +118,14 @@
if test "$MCFASTRPM" != 0 ; then
$RPM -qp --qf "[%{REQUIRENAME}\n]" "$f" | grep "(none)" > /dev/null ||
echo "$FILEPREF 0 $DATE INFO/REQUIRENAME"
+ $RPM -qp --qf "[%|ENHANCESFLAGS:depflag_strong?{}:{%{ENHANCESNAME}
%{ENHANCESFLAGS:depflags} %{ENHANCESVERSION}\n}|]" "$f" | grep "(none)" >
/dev/null ||
+ echo "$FILEPREF 0 $DATE INFO/ENHANCES"
+ $RPM -qp --qf "[%|SUGGESTSFLAGS:depflag_strong?{}:{%{SUGGESTSNAME}
%{SUGGESTSFLAGS:depflags} %{SUGGESTSVERSION}\n}|]" "$f" | grep "(none)" >
/dev/null ||
+ echo "$FILEPREF 0 $DATE INFO/SUGGESTS"
+ $RPM -qp --qf "[%|SUGGESTSFLAGS:depflag_strong?{%{SUGGESTSNAME}
%{SUGGESTSFLAGS:depflags} %{SUGGESTSVERSION}\n}|]" "$f" | grep "(none)" >
/dev/null ||
+ echo "$FILEPREF 0 $DATE INFO/ENHANCES"
+ $RPM -qp --qf "[%|ENHANCESFLAGS:depflag_strong?{%{ENHANCESNAME}
%{ENHANCESFLAGS:depflags} %{ENHANCESVERSION}\n}|]" "$f" | grep "(none)" >
/dev/null ||
+ echo "$FILEPREF 0 $DATE INFO/SUGGESTS"
$RPM -qp --qf "[%{OBSOLETES}\n]" "$f" | grep "(none)" > /dev/null ||
echo "$FILEPREF 0 $DATE INFO/OBSOLETES"
$RPM -qp --qf "[%{PROVIDES}\n]" "$f" | grep "(none)" > /dev/null ||
@@ -128,8 +136,10 @@
echo "$FILEPREF 0 $DATE INFO/CHANGELOG"
else
echo "$FILEPREF 0 $DATE INFO/REQUIRENAME"
- echo "$FILEPREF 0 $DATE INFO/OBSOLETES"
- echo "$FILEPREF 0 $DATE INFO/PROVIDES"
+ echo "$FILEPREF 0 $DATE INFO/ENHANCES"
+ echo "$FILEPREF 0 $DATE INFO/SUGGESTS"
+ echo "$FILEPREF 0 $DATE INFO/RECOMMENDS"
+ echo "$FILEPREF 0 $DATE INFO/SUPPLEMENTS"
echo "$FILEPREF 0 $DATE INFO/CONFLICTS"
echo "$FILEPREF 0 $DATE INFO/CHANGELOG"
fi
@@ -162,6 +172,10 @@
INFO/LICENSE) $RPM -qp --qf "%{LICENSE}\n" "$f" >"$3"; exit
0;;
INFO/RPMVERSION) $RPM -qp --qf "%{RPMVERSION}\n" "$f" >"$3";
exit 0;;
INFO/REQUIRENAME) $RPM -qp --qf "[%{REQUIRENAME}
%{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]" "$f" >"$3"; exit 0;;
+ INFO/ENHANCES) $RPM -qp --qf
"[%|ENHANCESFLAGS:depflag_strong?{}:{%{ENHANCESNAME} %{ENHANCESFLAGS:depflags}
%{ENHANCESVERSION}\n}|]" "$f" >"$3"; exit 0;;
+ INFO/SUGGESTS) $RPM -qp --qf
"[%|SUGGESTSFLAGS:depflag_strong?{}:{%{SUGGESTSNAME} %{SUGGESTSFLAGS:depflags}
%{SUGGESTSVERSION}\n}|]" "$f" >"$3"; exit 0;;
+ INFO/RECOMMENDS) $RPM -qp --qf
"[%|SUGGESTSFLAGS:depflag_strong?{%{SUGGESTSNAME} %{SUGGESTSFLAGS:depflags}
%{SUGGESTSVERSION}\n}|]" "$f" >"$3"; exit 0;;
+ INFO/SUPPLEMENTS) $RPM -qp --qf
"[%|ENHANCESFLAGS:depflag_strong?{%{ENHANCESNAME} %{ENHANCESFLAGS:depflags}
%{ENHANCESVERSION}\n}|]" "$f" >"$3"; exit 0;;
INFO/PROVIDES) $RPM -qp --qf "[%{PROVIDES}\n]" "$f" >"$3";
exit 0;;
INFO/SCRIPTS/PREIN) $RPM -qp --qf "%{RPMTAG_PREIN}\n" "$f" >"$3";
exit 0;;
INFO/SCRIPTS/POSTIN) $RPM -qp --qf "%{RPMTAG_POSTIN}\n" "$f" >"$3";
exit 0;;
++++++ mc-syntax-hpp.patch ++++++
--- syntax/Syntax
+++ syntax/Syntax
@@ -76,7 +76,7 @@
file ..\*\.(texi|texinfo|TEXI|TEXINFO)$ Texinfo\sDocument
include texinfo.syntax

-file ..\*\\.([chC]|CC|cxx|cc|cpp|CPP|CXX|hxx|h\.in)$ C/C\+\+\sProgram
+file ..\*\\.([chC]|CC|cxx|cc|cpp|CPP|CXX|hxx|hpp|HPP|h\.in)$ C/C\+\+\sProgram
include c.syntax

file ..\*\\.d$ D\sProgram
++++++ mc-utf8-nlink.patch ++++++
--- /var/tmp/diff_new_pack.w13801/_old 2007-11-06 00:29:41.000000000 +0100
+++ /var/tmp/diff_new_pack.w13801/_new 2007-11-06 00:29:41.000000000 +0100
@@ -1,6 +1,6 @@
--- src/screen.c
+++ src/screen.c
-@@ -646,7 +646,7 @@
+@@ -669,7 +669,7 @@
SLsmg_write_nwchars (((wchar_t *) buffer)
+ txtlen - n2, n2);
} else

++++++ mc-utf8-slang2.patch -> mc-utf8.patch ++++++
++++ 5373 lines (skipped)
++++ between GNOME/mc/mc-utf8-slang2.patch
++++ and /mounts/work_src_done/STABLE/mc/mc-utf8.patch

++++++ mc-word_docs.patch ++++++
--- lib/mc.ext.in
+++ lib/mc.ext.in
@@ -449,12 +449,17 @@
Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else
(ooffice %f >/dev/null 2>&1 &); fi >/dev/null

# Microsoft Word Document
-regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$
+type/^Microsoft\ Office\ Document
Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else
(ooffice %f >/dev/null 2>&1 &); fi >/dev/null
- View=%view{ascii} catdoc -w %f || word2x -f text %f - || strings %f
+ View=%view{ascii} wvText %f - || strings %f
+
type/^Microsoft\ Word
Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else
(ooffice %f >/dev/null 2>&1 &); fi >/dev/null
- View=%view{ascii} catdoc -w %f || word2x -f text %f - || strings %f
+ View=%view{ascii} wvText %f - || strings %f
+
+regex/\.([Dd]ot|DOT|[Ww]ri|WRI)$
+ Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (OOo
%f >/dev/null 2>&1 &); fi >/dev/null
+ View=%view{ascii} wvText %f - || strings %f

# RTF document
regex/\.([rR][tT][fF])$
++++++ mc-wrapper.patch ++++++
--- lib/mc.sh.in
+++ lib/mc.sh.in
@@ -1 +1,8 @@
-alias mc='. @suppbindir@/mc-wrapper.sh'
+mc ()
+{
+. @suppbindir@/mc-wrapper.sh
+}
+if [ -n "$BASH_VERSION" ]
+then
+ export -f mc
+fi
++++++ mc-x11browser.diff ++++++
--- lib/mc.ext.in
+++ lib/mc.ext.in
@@ -432,8 +432,8 @@

# html
regex/\.([hH][tT][mM][lL]?)$
- Open=(if test -n "@X11_WWW@" && test -n "$DISPLAY"; then (@X11_WWW@
file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more}
%f; fi) 2>/dev/null
- View=%view{ascii} lynx -dump -force_html %f
+ Open=/usr/share/mc/bin/x11_browser %f
+ View=%view{ascii} w3m -dump -T text/html %f;

# StarOffice 5.2
shell/.sdw


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages