pool/mc
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 128811 from Base:System

Browse Source 
use uar extfs helper as fall-back for deb (forwarded request 128775 from subchaser)

OBS-URL: https://build.opensuse.org/request/show/128811
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mc?expand=0&rev=45
This commit is contained in:
Stephan Kulow 2012-07-25 08:34:32 +00:00 committed by Git OBS Bridge
commit 41ae1267c7
8 changed files with 123 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
04_add_gem_extension.patch
View File

@ -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 -

3
mc-4.8.1.3.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d25e1616cb9f8f34cb4421f3a7f88304f6be714fd7e8c9ce4106a8e136172d47
size 2033704

3
mc-4.8.1.4.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dd2f344fd3d508c5f46d8e661567574ff9b059c5df70fd51b4be76cfe4c35dd8
size 2043948

78
mc-extensions.patch
View File

@ -1,58 +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
@@ -226,8 +226,10 @@ regex/\.rpm$
--- 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://
- 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
+ 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
@ -64,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

39
mc-extfs-helpers-deb.patch Normal file
View File

@ -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=<<EOInstall;
WARNING
@@ -192,6 +201,20 @@
umask 077;
+
+# check for required dpkg utilities
+my $dpkg_deb = _which('dpkg-deb');
+my $dpkg = _which('dpkg');
+
+# use uar extfs-heper if not exists
+if (not defined $dpkg_deb or not defined $dpkg)
+{
+ if ($0 =~ /^(.*)\/deb$/) {
+ my $uar = "$1/uar" ;
+ exec $uar, @ARGV;
+ }
+}
+
if($ARGV[0] eq "list") { shift; &mcdebfs_list(@ARGV); exit 0; }
elsif($ARGV[0] eq "copyout") { shift; &mcdebfs_copyout(@ARGV); exit 0; }
elsif($ARGV[0] eq "run") { shift; &mcdebfs_run(@ARGV); exit 0; }

1
mc-rpmlintrc
View File

@ -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")

38
mc.changes
View File

@ -1,3 +1,41 @@
-------------------------------------------------------------------
Mon Jul 23 13:35:04 UTC 2012 - subchaser1@gmail.com
- extfs deb helper: execute uar helper as fall-back if deb utilities is not installed
-------------------------------------------------------------------
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

8
mc.spec
View File

@ -21,8 +21,8 @@ Summary: Midnight Commander
License: GPL-3.0+
Group: Productivity/File utilities
Url: http://www.midnight-commander.org/
Version: 4.8.1.3
Release: 0
Version: 4.8.1.4
Release: 0.0
Source: https://www.midnight-commander.org/downloads/mc-%{version}.tar.xz
Source1: x11_browser
Source2: %{name}.desktop
@ -41,10 +41,10 @@ Patch12: mc-wrapper.patch
Patch16: mc-esc-seq.patch
Patch17: mc-rpm.patch
Patch20: mc-f-keys.patch
Patch21: mc-extfs-helpers-deb.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.
@ -116,8 +116,8 @@ target directory.
%patch17
%patch18
%patch20
%patch21
%patch24
%patch30
%patch31
%patch32
%patch41