From 48f6065b6b8e560fd0bed5f34854a93c2e02941f837bd2b7700516a390c3579f Mon Sep 17 00:00:00 2001 From: David Haller Date: Mon, 23 Jul 2012 10:55:46 +0000 Subject: [PATCH 1/4] Accepting request 128743 from home:subchaser - updated to latest stable version 4.8.1.4 - deb file support fixed OBS-URL: https://build.opensuse.org/request/show/128743 OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=50 --- 04_add_gem_extension.patch | 13 ------------- mc-4.8.1.3.tar.xz | 3 --- mc-4.8.1.4.tar.xz | 3 +++ mc-extensions.patch | 10 +++------- mc-rpmlintrc | 1 - mc.changes | 33 +++++++++++++++++++++++++++++++++ mc.spec | 4 +--- 7 files changed, 40 insertions(+), 27 deletions(-) delete mode 100644 04_add_gem_extension.patch delete mode 100644 mc-4.8.1.3.tar.xz create mode 100644 mc-4.8.1.4.tar.xz diff --git a/04_add_gem_extension.patch b/04_add_gem_extension.patch deleted file mode 100644 index f53493c..0000000 --- a/04_add_gem_extension.patch +++ /dev/null @@ -1,13 +0,0 @@ -Description: Add gem extension - ---- misc/mc.ext.in -+++ misc/mc.ext.in -@@ -107,7 +107,7 @@ - ### Archives ### - - # .tgz, .tpz, .tar.gz, .tar.z, .tar.Z, .ipk --regex/\.t([gp]?z|ar\.g?[zZ])$|\.ipk$ -+regex/\.t([gp]?z|ar\.g?[zZ])$|\.ipk|\.gem$ - Open=%cd %p/utar:// - View=%view{ascii} gzip -dc %f 2>/dev/null | tar tvvf - - diff --git a/mc-4.8.1.3.tar.xz b/mc-4.8.1.3.tar.xz deleted file mode 100644 index 6e1dbd3..0000000 --- a/mc-4.8.1.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d25e1616cb9f8f34cb4421f3a7f88304f6be714fd7e8c9ce4106a8e136172d47 -size 2033704 diff --git a/mc-4.8.1.4.tar.xz b/mc-4.8.1.4.tar.xz new file mode 100644 index 0000000..8a4a01b --- /dev/null +++ b/mc-4.8.1.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd2f344fd3d508c5f46d8e661567574ff9b059c5df70fd51b4be76cfe4c35dd8 +size 2043948 diff --git a/mc-extensions.patch b/mc-extensions.patch index cd4e4c9..90c31cb 100644 --- a/mc-extensions.patch +++ b/mc-extensions.patch @@ -2,16 +2,12 @@ Index: misc/mc.ext.in =================================================================== --- misc/mc.ext.in.orig 2010-07-07 14:39:08.723510066 +0200 +++ misc/mc.ext.in 2010-07-07 14:55:35.231010197 +0200 -@@ -226,8 +226,10 @@ regex/\.rpm$ - +@@ -237,7 +237,7 @@ # deb regex/\.u?deb$ -- Open=%cd %p/deb:// + Open=%cd %p/deb:// - View=%view{ascii} dpkg-deb -I %f && echo && dpkg-deb -c %f -+# Open=%cd %p/deb:// -+# View=%view{ascii} dpkg-deb -I %f && echo && dpkg-deb -c %f -+ Open=%cd %p#uar:// -+ View=%view{ascii} file %f && nm %f ++ View=%view{ascii} if type -p dpkg-deb >/dev/null ; then dpkg-deb -I %f && echo && dpkg-deb -c %f ; else file %f && echo && ar tv %f ; fi # dpkg shell/.debd diff --git a/mc-rpmlintrc b/mc-rpmlintrc index 42f082b..6e91c2f 100644 --- a/mc-rpmlintrc +++ b/mc-rpmlintrc @@ -1,3 +1,2 @@ addFilter("mc\..* W: script-without-shebang /usr/lib/mc/fish/.+") addFilter("mc\..* W: script-without-shebang /usr/share/mc/mc.*\.c?sh") -addFilter("mc\..* W: non-executable-script /etc/mc/edit.(spell|indent).rc") diff --git a/mc.changes b/mc.changes index 37fe950..2be3754 100644 --- a/mc.changes +++ b/mc.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Sat Jul 21 10:54:16 UTC 2012 - subchaser1@gmail.com + +- fixed deb file extension support, use dpkg-deb from 'deb' package + if installed + +------------------------------------------------------------------- +Sat Jul 21 09:39:11 UTC 2012 - subchaser1@gmail.com + +Updated to version 4.8.1.4 + +- Misc + * Tweak and cleanup of code in case of --disable-charset option usage (#2827) + * File extension support: + - .gem - rubygems (#2797) + - .cpio.xz - compressed cpio archives (#2798) + +- Fixes + * Build failure on FreeBSD 6 (#2808) + * src/filemanager/filegui.c does not compile on Solaris due to missing macros (#2825) + * Loss of data on copy to full partition (#2829) + * Misinterpretation of dirs as command line arguments (#2783, #2805) + * Number of panelized files was limited to 127 (#2813) + * URL with port was stored wrong in history (#2833) + * Can't find 00 (zeroes) in patterns in hex search (#2795) + * Hotkey conflicts in 'Search' dialog (#2843) + * Garbage directory listing in ftpfs (#2800) + * Incomplete sand256 skin (#2807) + * mcedit scripts are installed as data files (#1437) + * Tests failure on PowerPC,S390,S390x (#2804) + * Fail to compile if --without-vfs configure option specified (#2834) + * do_panel_cd: FTBFS with --enable-tests on [kfreebsd-i386,kfreebsd-amd64,ia64,armhf] (#2803) + ------------------------------------------------------------------- Mon May 28 09:37:28 UTC 2012 - subchaser1@gmail.com diff --git a/mc.spec b/mc.spec index fd62bce..708e35c 100644 --- a/mc.spec +++ b/mc.spec @@ -21,7 +21,7 @@ Summary: Midnight Commander License: GPL-3.0+ Group: Productivity/File utilities Url: http://www.midnight-commander.org/ -Version: 4.8.1.3 +Version: 4.8.1.4 Release: 0 Source: https://www.midnight-commander.org/downloads/mc-%{version}.tar.xz Source1: x11_browser @@ -44,7 +44,6 @@ Patch20: mc-f-keys.patch #debian fixes for vfs Patch24: 02_ignore_ftp_chmod_error.patch #Debian fixes -Patch30: 04_add_gem_extension.patch Patch31: 09_uzip_broken_528239.patch Patch32: 20_wrong_path_to_wrappers.patch # PATCH-FIX-UPSTREAM mc-multi-press-f-keys.patch mc287 sbrabec@suse.cz - Fixed Esc + Numeral F-key emulation. @@ -117,7 +116,6 @@ target directory. %patch18 %patch20 %patch24 -%patch30 %patch31 %patch32 %patch41 From ffb1ab41563cb0c5bf6f57f8bd3e90d8e5bd37ac035b64ccdb7820b26be3eb97 Mon Sep 17 00:00:00 2001 From: David Haller Date: Mon, 23 Jul 2012 12:32:16 +0000 Subject: [PATCH 2/4] - use uar: instead of deb:, some readability stuff OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=51 --- mc-extensions.patch | 76 ++++++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 36 deletions(-) diff --git a/mc-extensions.patch b/mc-extensions.patch index 90c31cb..2d631fd 100644 --- a/mc-extensions.patch +++ b/mc-extensions.patch @@ -1,54 +1,54 @@ -Index: misc/mc.ext.in -=================================================================== ---- misc/mc.ext.in.orig 2010-07-07 14:39:08.723510066 +0200 -+++ misc/mc.ext.in 2010-07-07 14:55:35.231010197 +0200 -@@ -237,7 +237,7 @@ +--- misc/mc.ext.in.orig 2012-07-23 14:07:11.000000000 +0200 ++++ misc/mc.ext.in 2012-07-23 14:11:39.000000000 +0200 +@@ -236,8 +236,9 @@ + # deb regex/\.u?deb$ - Open=%cd %p/deb:// +- Open=%cd %p/deb:// - View=%view{ascii} dpkg-deb -I %f && echo && dpkg-deb -c %f ++ #Open=%cd %p/deb:// ++ Open=%cd %p/uar:// + View=%view{ascii} if type -p dpkg-deb >/dev/null ; then dpkg-deb -I %f && echo && dpkg-deb -c %f ; else file %f && echo && ar tv %f ; fi # dpkg shell/.debd -@@ -399,7 +399,8 @@ include/image +@@ -415,7 +416,8 @@ ### Sound files ### regex/\.([wW][aA][vV]|[sS][nN][dD]|[vV][oO][cC]|[aA][uU]|[sS][mM][pP]|[aA][iI][fF][fF]|[sS][nN][dD])$ - Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi -+ Include=audio -+# Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi ++ #Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi ++ Include=audio regex/\.([mM][oO][dD]|[sS]3[mM]|[xX][mM]|[iI][tT]|[mM][tT][mM]|669|[sS][tT][mM]|[uU][lL][tT]|[fF][aA][rR])$ Open=mikmod %f -@@ -409,15 +410,22 @@ regex/\.([wW][aA][wW]22)$ +@@ -425,15 +427,21 @@ Open=vplay -s 22 %f regex/\.([mM][pP]3)$ - 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' -+ Include=audio -+# 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' ++ #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' ++ Include=audio + +regex/\.([mM][kK][aA])$ -+ Include=audio ++ Include=audio regex/\.([oO][gG][gG|aA|vV|xX])$ - Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms -e %f >/dev/null 2>&1 &); fi -+ Include=audio -+# Open=ogg123 %f -+# Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms -e %f >/dev/null 2>&1 &); fi ++ #Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms -e %f >/dev/null 2>&1 &); fi ++ Include=audio View=%view{ascii} ogginfo %s regex/\.([sS][pP][xX]|[fF][lL][aA][cC])$ - Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi -+ Include=audio -+# Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi ++ #Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi ++ Include=audio regex/\.([mM][iI][dD][iI]?|[rR][mM][iI][dD]?)$ Open=timidity %f -@@ -426,11 +434,15 @@ regex/\.([wW][mM][aA])$ +@@ -442,11 +450,15 @@ Open=mplayer -vo null %f View=%view{ascii} mplayer -quiet -slave -frames 0 -vo null -ao null -identify %f 2>/dev/null | tail +13 || file %f @@ -60,63 +60,67 @@ Index: misc/mc.ext.in regex/\.([mM]3[uU]|[pP][lL][sS])$ - Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi ++ #Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi + Open=mplayer -vo null -playlist %f -+# Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi ### Video ### -@@ -478,12 +490,12 @@ include/video +@@ -502,14 +514,16 @@ # Postscript type/^PostScript - Open=(gv %f >/dev/null 2>&1 &) ++ #Open=(gv %f >/dev/null 2>&1 &) + Open=(xdg-open %f >/dev/null 2>&1 &) View=%view{ascii} ps2ascii %f # PDF type/^PDF - Open=(xpdf %f >/dev/null 2>&1 &) -+ Open=(xdg-open %f >/dev/null 2>&1 &) ++ #Open=(xpdf %f >/dev/null 2>&1 &) #Open=(acroread %f &) #Open=(ghostview %f &) ++ Open=(xdg-open %f >/dev/null 2>&1 &) View=%view{ascii} pdftotext %f - -@@ -511,27 +523,33 @@ shell/.abw + + # The following code very ugly and should not be taken as example. +@@ -535,27 +549,33 @@ # Microsoft Word Document 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 -+ Open=(xdg-open %f &) -+# Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null ++ #Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null ++ Open=(xdg-open %f >/dev/null 2>&1 &) 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 -+ Open=(xdg-open %f &) -+# Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null ++ #Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null ++ Open=(xdg-open %f >/dev/null 2>&1 &) 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 -+ Open=(xdg-open %f &) -+# Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (OOo %f >/dev/null 2>&1 &); fi >/dev/null ++ #Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (OOo %f >/dev/null 2>&1 &); fi >/dev/null ++ Open=(xdg-open %f >/dev/null 2>&1 &) View=%view{ascii} wvText %f - || strings %f # RTF document regex/\.([rR][tT][fF])$ - Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null -+ Open=(xdg-open %f &) -+# Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null ++ #Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null ++ Open=(xdg-open %f >/dev/null 2>&1 &) # Microsoft Excel Worksheet regex/\.([xX][lL][sSwW])$ - Open=if which gnumeric ; then (gnumeric %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null -+ Open=(xdg-open %f &) -+# Open=if which gnumeric ; then (gnumeric %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null ++ #Open=if which gnumeric ; then (gnumeric %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null ++ Open=(xdg-open %f >/dev/null 2>&1 &) View=%view{ascii} xls2csv %f || strings %f type/^Microsoft\ Excel - Open=if which gnumeric ; then (gnumeric %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null -+ Open=(xdg-open %f &) -+# Open=if which gnumeric ; then (gnumeric %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null ++ #Open=if which gnumeric ; then (gnumeric %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null ++ Open=(xdg-open %f >/dev/null 2>&1 &) View=%view{ascii} xls2csv %f || strings %f # Framemaker From 8c889281f690cb09ddd4caf0721429fd9a68186e163d195fe6734cefbdf8f35e Mon Sep 17 00:00:00 2001 From: David Haller Date: Mon, 23 Jul 2012 12:47:22 +0000 Subject: [PATCH 3/4] - revert deb/uar change, but keep uar commented out as an alternative (I prefer the "uar" way, should be faster too ;) OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=52 --- mc-extensions.patch | 4 ++-- mc.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mc-extensions.patch b/mc-extensions.patch index 2d631fd..e6db65d 100644 --- a/mc-extensions.patch +++ b/mc-extensions.patch @@ -6,8 +6,8 @@ regex/\.u?deb$ - Open=%cd %p/deb:// - View=%view{ascii} dpkg-deb -I %f && echo && dpkg-deb -c %f -+ #Open=%cd %p/deb:// -+ Open=%cd %p/uar:// ++ Open=%cd %p/deb:// ++ #Open=%cd %p/uar:// + View=%view{ascii} if type -p dpkg-deb >/dev/null ; then dpkg-deb -I %f && echo && dpkg-deb -c %f ; else file %f && echo && ar tv %f ; fi # dpkg diff --git a/mc.spec b/mc.spec index 708e35c..bcaaf77 100644 --- a/mc.spec +++ b/mc.spec @@ -22,7 +22,7 @@ License: GPL-3.0+ Group: Productivity/File utilities Url: http://www.midnight-commander.org/ Version: 4.8.1.4 -Release: 0 +Release: 0.0 Source: https://www.midnight-commander.org/downloads/mc-%{version}.tar.xz Source1: x11_browser Source2: %{name}.desktop From 9aec29ef3d7246afddcedf9e1dfc9e0791401541388f8f79882a5ac573d14a45 Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Tue, 24 Jul 2012 00:04:41 +0000 Subject: [PATCH 4/4] Accepting request 128775 from home:subchaser use uar extfs helper as fall-back for deb OBS-URL: https://build.opensuse.org/request/show/128775 OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=53 --- mc-extfs-helpers-deb.patch | 39 ++++++++++++++++++++++++++++++++++++++ mc.changes | 5 +++++ mc.spec | 2 ++ 3 files changed, 46 insertions(+) create mode 100644 mc-extfs-helpers-deb.patch diff --git a/mc-extfs-helpers-deb.patch b/mc-extfs-helpers-deb.patch new file mode 100644 index 0000000..c145dec --- /dev/null +++ b/mc-extfs-helpers-deb.patch @@ -0,0 +1,39 @@ +--- src/vfs/extfs/helpers/deb.in.orig 2012-04-20 11:21:37.000000000 +0400 ++++ src/vfs/extfs/helpers/deb.in 2012-07-23 17:21:47.000000000 +0400 +@@ -176,6 +176,15 @@ + } + } + ++sub _which ++{ ++ my $app = shift; ++ foreach my $dir (split/:/, $ENV{'PATH'}) { ++ return "$dir/$app" if -x "$dir/$app"; ++ } ++ return undef; ++} ++ + $pressinstall=<