From a05b783d91a22f3381f3c2ebc2d226e227ceaa696ac28fe5bbc9683df16405f3 Mon Sep 17 00:00:00 2001 From: David Haller Date: Sat, 23 Nov 2013 06:51:59 +0000 Subject: [PATCH 1/4] Accepting request 207993 from home:dnh:branches:Base:System make urar-helper patch portable OBS-URL: https://build.opensuse.org/request/show/207993 OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=73 --- mc-extfs-helpers-urar.patch | 21 ++++++++++++--------- mc.changes | 5 +++++ mc.spec | 10 ++-------- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/mc-extfs-helpers-urar.patch b/mc-extfs-helpers-urar.patch index ad12a52..58fc0f6 100644 --- a/mc-extfs-helpers-urar.patch +++ b/mc-extfs-helpers-urar.patch @@ -1,6 +1,7 @@ ---- src/vfs/extfs/helpers/urar.in.orig 2013-11-12 18:27:16.000000000 +0100 -+++ src/vfs/extfs/helpers/urar.in 2013-11-12 19:05:31.000000000 +0100 -@@ -42,14 +42,36 @@ +diff -urN -x '*~' mc-4.8.10.orig/src/vfs/extfs/helpers/urar.in mc-4.8.10/src/vfs/extfs/helpers/urar.in +--- mc-4.8.10.orig/src/vfs/extfs/helpers/urar.in 2013-08-02 17:02:39.000000000 +0200 ++++ mc-4.8.10/src/vfs/extfs/helpers/urar.in 2013-11-22 19:30:40.000000000 +0100 +@@ -42,14 +42,38 @@ $UNRAR v -c- -cfg- "$1" | @AWK@ -v uid=`id -u` -v gid=`id -g` ' BEGIN { flag=0 } /^-----------/ { flag++; if (flag > 1) exit 0; next } @@ -13,10 +14,12 @@ - $1="-rw-r--r--" - printf "%s 1 %s %s %d %02d/%02d/%02d %s ./%s\n", $1, uid, gid, $2, a[2], a[1], a[3], $6, $8 +flag == 1 { -+ name=""; ++ name=""; delete fields; delete seps; + -+ ### split line, save n-fields and save seperators in 'seps' -+ nf = split($0, fields, " ", seps); ++ ### split line, save n-fields and save seperators in "seps" ++ ### tested with busybox awk ++ nameparts = split($0, fields, " "); ++ split($0, seps, "[^ \t]+"); + + ### split date for reformatting + split(fields[5], date, "-"); @@ -30,9 +33,9 @@ + } + } + -+ ### join filename from fields 8 .. nf (saved above) -+ for(i = 8; i <= nf; i++) { -+ name=name fields[i] seps[i]; ++ ### join filename from fields 8 .. nameparts (saved above) ++ for(i = 8; i <= nameparts; i++) { ++ name=name fields[i] seps[i+1]; + } + ### remove padding blanks from short names + if (length(name)<13) { diff --git a/mc.changes b/mc.changes index 9644984..26d77e6 100644 --- a/mc.changes +++ b/mc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 22 18:34:57 UTC 2013 - dnh@opensuse.org + +- make urar-helper patch portable (tested with busybox awk) + ------------------------------------------------------------------- Fri Nov 15 07:31:20 UTC 2013 - dnh@opensuse.org diff --git a/mc.spec b/mc.spec index 4cf9864..78ab467 100644 --- a/mc.spec +++ b/mc.spec @@ -44,12 +44,7 @@ Patch20: mc-f-keys.patch Patch21: mc-extfs-helpers-deb.patch # add mc-extfs-helpers-urar.patch (by dnh@opensuse.org) - Fix urar -# extfs failing on files with spaces (bnc#849082), needs gawk >= 4.0.0 -# and is not portable to other awks, so expect upstream changes. As of -# now (Fri Nov 15 09:43:39 2013), upstream uses a "index by the CRC -# field" approach as mentioned in bnc#849082. I prefer the gawk >= -# 4.0.0 version with the "seps" fourth argument to the "split" -# function. YOpinionMV ;) +# extfs failing on files with spaces (bnc#849082). Forwarded to upstream. Patch22: mc-extfs-helpers-urar.patch #debian fixes for vfs @@ -89,7 +84,6 @@ BuildRequires: xdg-utils BuildRequires: xorg-x11-devel BuildRequires: xz Requires(pre): permissions -Requires: gawk >= 4.0.0 Recommends: %{name}-lang = %{version} %description @@ -129,7 +123,7 @@ target directory. %patch18 %patch20 %patch21 -%patch22 +%patch22 -p1 %patch24 %patch31 %patch32 From c51cd48d0153a2a03a2430a2435e58ef956fe6fba2b17ea0284f83d5a0be20b0 Mon Sep 17 00:00:00 2001 From: David Haller Date: Sat, 23 Nov 2013 07:01:44 +0000 Subject: [PATCH 2/4] Accepting request 208012 from home:dnh:branches:Base:System - fix SLE* %post scriptlet error (%set_permissions not available) OBS-URL: https://build.opensuse.org/request/show/208012 OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=74 --- mc.changes | 5 +++++ mc.spec | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/mc.changes b/mc.changes index 26d77e6..c7823f2 100644 --- a/mc.changes +++ b/mc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Nov 23 05:42:12 UTC 2013 - dnh@opensuse.org + +- fix SLE* %post scriptlet error (%set_permissions not available) + ------------------------------------------------------------------- Fri Nov 22 18:34:57 UTC 2013 - dnh@opensuse.org diff --git a/mc.spec b/mc.spec index 78ab467..9b53930 100644 --- a/mc.spec +++ b/mc.spec @@ -171,7 +171,11 @@ rm -rf %{buildroot}%{_datadir}/locale/be@tarask rm -rf %{buildroot} %post +%if 0%{?suse_version} >= 1140 %set_permissions %{_libexecdir}/mc/cons.saver +%else +%run_permissions +%endif %verifyscript %verify_permissions -e %{_libexecdir}/mc/cons.saver @@ -214,6 +218,13 @@ rm -rf %{buildroot} %files lang -f %name.lang %defattr(-, root, root) +%if 0%{?suse_version} < 1140 || 0%{?sles_version} && 0%{?sles_version} <= 11 +%lang(sv) %dir %{_datadir}/locale/sv_SE +%lang(sv) %dir %{_datadir}/locale/sv_SE/LC_MESSAGES +%lang(szl) %dir %{_datadir}/locale/szl +%lang(szl) %dir %{_datadir}/locale/szl/LC_MESSAGES +%endif + %lang(hu) %dir %{_mandir}/hu/ %lang(hu) %dir %{_mandir}/hu/man1/ %lang(hu) %{_mandir}/hu/man1/mc.1.gz From 289e68037e0f00a945ef49a13d908f84bf1b3e0ad16f823c50412d88f8113c97 Mon Sep 17 00:00:00 2001 From: David Haller Date: Sat, 23 Nov 2013 18:16:12 +0000 Subject: [PATCH 3/4] Accepting request 208058 from home:dnh:branches:Base:System - fix the urar patch (thanks to D. Werner again) OBS-URL: https://build.opensuse.org/request/show/208058 OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=75 --- mc-extfs-helpers-urar.patch | 7 ++++--- mc.changes | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/mc-extfs-helpers-urar.patch b/mc-extfs-helpers-urar.patch index 58fc0f6..aaef3a1 100644 --- a/mc-extfs-helpers-urar.patch +++ b/mc-extfs-helpers-urar.patch @@ -1,7 +1,7 @@ diff -urN -x '*~' mc-4.8.10.orig/src/vfs/extfs/helpers/urar.in mc-4.8.10/src/vfs/extfs/helpers/urar.in --- mc-4.8.10.orig/src/vfs/extfs/helpers/urar.in 2013-08-02 17:02:39.000000000 +0200 -+++ mc-4.8.10/src/vfs/extfs/helpers/urar.in 2013-11-22 19:30:40.000000000 +0100 -@@ -42,14 +42,38 @@ ++++ mc-4.8.10/src/vfs/extfs/helpers/urar.in 2013-11-23 19:09:46.000000000 +0100 +@@ -42,14 +42,39 @@ $UNRAR v -c- -cfg- "$1" | @AWK@ -v uid=`id -u` -v gid=`id -g` ' BEGIN { flag=0 } /^-----------/ { flag++; if (flag > 1) exit 0; next } @@ -20,6 +20,7 @@ diff -urN -x '*~' mc-4.8.10.orig/src/vfs/extfs/helpers/urar.in mc-4.8.10/src/vfs + ### tested with busybox awk + nameparts = split($0, fields, " "); + split($0, seps, "[^ \t]+"); ++ sub("^ ", "", seps[8]); + + ### split date for reformatting + split(fields[5], date, "-"); @@ -35,7 +36,7 @@ diff -urN -x '*~' mc-4.8.10.orig/src/vfs/extfs/helpers/urar.in mc-4.8.10/src/vfs + + ### join filename from fields 8 .. nameparts (saved above) + for(i = 8; i <= nameparts; i++) { -+ name=name fields[i] seps[i+1]; ++ name=name seps[i] fields[i]; + } + ### remove padding blanks from short names + if (length(name)<13) { diff --git a/mc.changes b/mc.changes index c7823f2..e269897 100644 --- a/mc.changes +++ b/mc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Nov 23 18:11:35 UTC 2013 - dnh@opensuse.org + +- fix the urar patch (thanks to D. Werner again) + ------------------------------------------------------------------- Sat Nov 23 05:42:12 UTC 2013 - dnh@opensuse.org From 765d0fb1cfdf11fb044e634864cb4629777b540f5cce36bb6a9f14d1c1273d43 Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Tue, 26 Nov 2013 03:35:21 +0000 Subject: [PATCH 4/4] Accepting request 208356 from home:dnh:branches:Base:System - What a ghastly %description ... Where'd that come from? ;) Fixed with text from the README and a little added mention of Norton Cmdr - What's with those "trailing spaces" for filenames with length <13? - fix the urar patch (add trailing whitespace) (thanks to D. Werner again) OBS-URL: https://build.opensuse.org/request/show/208356 OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=76 --- mc-extfs-helpers-urar.patch | 16 ++++++++++------ mc.changes | 16 ++++++++++++++++ mc.spec | 24 +++++++----------------- 3 files changed, 33 insertions(+), 23 deletions(-) diff --git a/mc-extfs-helpers-urar.patch b/mc-extfs-helpers-urar.patch index aaef3a1..d037542 100644 --- a/mc-extfs-helpers-urar.patch +++ b/mc-extfs-helpers-urar.patch @@ -1,7 +1,7 @@ diff -urN -x '*~' mc-4.8.10.orig/src/vfs/extfs/helpers/urar.in mc-4.8.10/src/vfs/extfs/helpers/urar.in --- mc-4.8.10.orig/src/vfs/extfs/helpers/urar.in 2013-08-02 17:02:39.000000000 +0200 -+++ mc-4.8.10/src/vfs/extfs/helpers/urar.in 2013-11-23 19:09:46.000000000 +0100 -@@ -42,14 +42,39 @@ ++++ mc-4.8.10/src/vfs/extfs/helpers/urar.in 2013-11-25 23:10:36.000000000 +0100 +@@ -42,14 +42,43 @@ $UNRAR v -c- -cfg- "$1" | @AWK@ -v uid=`id -u` -v gid=`id -g` ' BEGIN { flag=0 } /^-----------/ { flag++; if (flag > 1) exit 0; next } @@ -38,10 +38,14 @@ diff -urN -x '*~' mc-4.8.10.orig/src/vfs/extfs/helpers/urar.in mc-4.8.10/src/vfs + for(i = 8; i <= nameparts; i++) { + name=name seps[i] fields[i]; + } -+ ### remove padding blanks from short names -+ if (length(name)<13) { -+ sub(" *$", "", name); -+ } ++ name=name seps[i]; ++ ++# ### where did this come from? I say: if in doubt: pass on the ++# ### unrar bug to our users ... I leave this in for reference. ++# ### remove padding blanks from short names ++# if (length(name)<13) { ++# sub(" *$", "", name); ++# } + + printf("%s 1 %s %s %d %02d/%02d/%02d %s ./%s\n", + fields[1], uid, gid, fields[2], date[2], diff --git a/mc.changes b/mc.changes index e269897..444a334 100644 --- a/mc.changes +++ b/mc.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Nov 25 22:45:29 UTC 2013 - dnh@opensuse.org + +- What a ghastly %description ... Where'd that come from? ;) Fixed + with text from the README and a little added mention of Norton Cmdr + +------------------------------------------------------------------- +Mon Nov 25 22:12:19 UTC 2013 - dnh@opensuse.org + +- What's with those "trailing spaces" for filenames with length <13? + +------------------------------------------------------------------- +Mon Nov 25 03:47:18 UTC 2013 - dnh@opensuse.org + +- fix the urar patch (add trailing whitespace) (thanks to D. Werner again) + ------------------------------------------------------------------- Sat Nov 23 18:11:35 UTC 2013 - dnh@opensuse.org diff --git a/mc.spec b/mc.spec index 9b53930..c616b8b 100644 --- a/mc.spec +++ b/mc.spec @@ -87,24 +87,14 @@ Requires(pre): permissions Recommends: %{name}-lang = %{version} %description -Midnight Commander is a Norton Commander clone, a program that -manipulates and manages files and directories. It is useful, fast, and -has color display on the Linux console. It also has mouse support if -you run the gpm mouse server. This program requires the terminal -description files in /usr/lib/terminfo, which are found in ncurses.rpm -(the essential ones) or terminfo.rpm (the rest). +GNU Midnight Commander (also referred to as MC) is a user shell much +like the (in)famous Norton Commander with text-mode full-screen +interface. It can be run on the OS console, in xterm and other +terminal emulators. -You can also use Midnight Commander under the X Window System with your -mouse. If you enter 'mc -c', colors are used. - -In Midnight Commander, the screen is divided into four sections: The -majority of the screen is covered by two directory panels. The second -to last line on the screen is the shell command line. The last line -displays the function key assignments. At the very top, the menu list -is shown. One of the directories displayed is the current working -directory. This is where most of the commands are found. For certain -commands, like copy and move, the second directory is used as the -target directory. +GNU Midnight Commander allows you to manage files while making most of +your screen and giving you a clear representation of the filesystem, yet +it's simple enough to be run over a telnet or ssh session. %lang_package