diff --git a/02_ignore_ftp_chmod_error.patch b/02_ignore_ftp_chmod_error.patch deleted file mode 100644 index f95f8b6..0000000 --- a/02_ignore_ftp_chmod_error.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: src/vfs/ftpfs/ftpfs.c -=================================================================== ---- src/vfs/ftpfs/ftpfs.c.orig -+++ src/vfs/ftpfs/ftpfs.c -@@ -2019,7 +2019,7 @@ ftpfs_chmod (struct vfs_class *me, const - - g_snprintf (buf, sizeof (buf), "SITE CHMOD %4.4o /%%s", (int) (mode & 07777)); - -- ret = ftpfs_send_command (vpath, buf, OPT_FLUSH); -+ ret = ftpfs_send_command (vpath, buf, OPT_FLUSH | OPT_IGNORE_ERROR); - - return ftpfs_ignore_chattr_errors ? 0 : ret; - } diff --git a/09_uzip_broken_528239.patch b/09_uzip_broken_528239.patch deleted file mode 100644 index 15bbc16..0000000 --- a/09_uzip_broken_528239.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Fix fails to display zip file contents after unzip update -Bug-Debian: http://bugs.debian.org/528239 -Author: Johannes Stezenbach -Author: Yury V. Zaytsev - ---- src/vfs/extfs/helpers/uzip.in 2010-02-25 11:51:39.000000000 +0100 -+++ src/vfs/extfs/helpers/uzip.in 2010-03-17 10:43:37.000000000 +0100 -@@ -19,7 +19,7 @@ - # Location of the unzip program - my $app_unzip = "@UNZIP@"; - # Set this to 1 if zipinfo (unzip -Z) is to be used (recommended), otherwise 0. --my $op_has_zipinfo = @HAVE_ZIPINFO@; -+my $op_has_zipinfo = 1; - - # Command used to list archives (zipinfo mode) - my $cmd_list_zi = "$app_unzip -Z -l -T"; diff --git a/mc-4.8.18.sha256 b/mc-4.8.18.sha256 deleted file mode 100644 index 79dc1c0..0000000 --- a/mc-4.8.18.sha256 +++ /dev/null @@ -1,2 +0,0 @@ -5b591e10dcbea95233434da40cdad4663d360229adf89826576c319667c103cb mc-4.8.18.tar.bz2 -f7636815c987c1719c4f5de2dcd156a0e7d097b1d10e4466d2bdead343d5bece mc-4.8.18.tar.xz diff --git a/mc-4.8.18.tar.xz b/mc-4.8.18.tar.xz deleted file mode 100644 index 8db8285..0000000 --- a/mc-4.8.18.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f7636815c987c1719c4f5de2dcd156a0e7d097b1d10e4466d2bdead343d5bece -size 2462080 diff --git a/mc-4.8.19.sha256 b/mc-4.8.19.sha256 new file mode 100644 index 0000000..0ca4199 --- /dev/null +++ b/mc-4.8.19.sha256 @@ -0,0 +1,2 @@ +d0dddfae7149fac903f74ef55cfcb2a198e0f7004346c7bded43669d61ba436f mc-4.8.19.tar.bz2 +eb9e56bbb5b2893601d100d0e0293983049b302c5ab61bfb544ad0ee2cc1f2df mc-4.8.19.tar.xz diff --git a/mc-4.8.19.tar.xz b/mc-4.8.19.tar.xz new file mode 100644 index 0000000..90ed79e --- /dev/null +++ b/mc-4.8.19.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb9e56bbb5b2893601d100d0e0293983049b302c5ab61bfb544ad0ee2cc1f2df +size 2521808 diff --git a/mc-rpm.patch b/mc-rpm.patch index 3d6b102..f895d66 100644 --- a/mc-rpm.patch +++ b/mc-rpm.patch @@ -1,25 +1,7 @@ ---- - misc/syntax/spec.syntax | 1 + - src/vfs/extfs/helpers/rpm | 8 ++++++++ - 2 files changed, 9 insertions(+) - -Index: mc-4.8.11/misc/syntax/spec.syntax -=================================================================== ---- mc-4.8.11.orig/misc/syntax/spec.syntax 2014-01-01 19:18:39.000000000 +0000 -+++ mc-4.8.11/misc/syntax/spec.syntax 2014-01-01 19:19:23.000000000 +0000 -@@ -35,6 +35,7 @@ context default - keyword whole Source\[0123456789\]: green - keyword whole Suggests: green - keyword whole Summary: green -+ keyword whole Supplements: green - keyword whole Vendor: green - keyword whole Version: green - keyword whole U\{Rr\}\{Ll\}: green -Index: mc-4.8.11/src/vfs/extfs/helpers/rpm -=================================================================== ---- mc-4.8.11.orig/src/vfs/extfs/helpers/rpm 2014-01-01 19:19:23.000000000 +0000 -+++ mc-4.8.11/src/vfs/extfs/helpers/rpm 2014-01-01 19:26:43.000000000 +0000 -@@ -159,6 +159,10 @@ mcrpmfs_list_fastRPM () +diff -purN a/src/vfs/extfs/helpers/rpm b/src/vfs/extfs/helpers/rpm +--- a/src/vfs/extfs/helpers/rpm 2017-02-24 21:25:57.000000000 +0100 ++++ b/src/vfs/extfs/helpers/rpm 2017-02-25 02:37:57.000000000 +0100 +@@ -162,6 +162,10 @@ mcrpmfs_list_fastRPM () echo "$FILEPREF 0 $DATE INFO/REQUIRES" echo "$FILEPREF 0 $DATE INFO/OBSOLETES" echo "$FILEPREF 0 $DATE INFO/PROVIDES" @@ -30,7 +12,7 @@ Index: mc-4.8.11/src/vfs/extfs/helpers/rpm echo "$FILEPREF 0 $DATE INFO/CONFLICTS" echo "$FILEPREF 0 $DATE INFO/CHANGELOG" } -@@ -294,6 +298,10 @@ mcrpmfs_copyout () +@@ -301,6 +305,10 @@ mcrpmfs_copyout () INFO/LICENSE) mcrpmfs_getOneTag "LICENSE" >"$2"; exit 0;; INFO/RPMVERSION) mcrpmfs_getRawOneTag "%{RPMVERSION}\n" >"$2"; exit 0;; INFO/REQUIRES) mcrpmfs_getRawOneTag "[%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]" >"$2"; exit 0;; @@ -39,5 +21,5 @@ Index: mc-4.8.11/src/vfs/extfs/helpers/rpm + INFO/RECOMMENDS) mcrpmfs_getRawOneTag "[%|SUGGESTSFLAGS:depflag_strong?{%{SUGGESTSNAME} %{SUGGESTSFLAGS:depflags} %{SUGGESTSVERSION}\n}|]" "$f" >"$3"; exit 0;; + INFO/SUPPLEMENTS) mcrpmfs_getRawOneTag "[%|ENHANCESFLAGS:depflag_strong?{%{ENHANCESNAME} %{ENHANCESFLAGS:depflags} %{ENHANCESVERSION}\n}|]" "$f" >"$3"; exit 0;; INFO/PROVIDES) mcrpmfs_getRawOneTag "[%{PROVIDES} %{PROVIDEFLAGS:depflags} %{PROVIDEVERSION}\n]" >"$2"; exit 0;; - INFO/SCRIPTS/PREIN) mcrpmfs_getRawOneTag "%{RPMTAG_PREIN}\n" >"$2"; exit 0;; - INFO/SCRIPTS/PREINPROG) mcrpmfs_getRawOneTag "%{RPMTAG_PREINPROG}\n" >"$2"; exit 0;; + INFO/SCRIPTS/PRETRANS) mcrpmfs_getRawOneTag "%{RPMTAG_PRETRANS}\n" >"$2"; exit 0;; + INFO/SCRIPTS/PRETRANSPROG) mcrpmfs_getRawOneTag "%{RPMTAG_PRETRANSPROG}\n" >"$2"; exit 0;; diff --git a/mc.changes b/mc.changes index f39e776..5d60c3d 100644 --- a/mc.changes +++ b/mc.changes @@ -1,3 +1,77 @@ +------------------------------------------------------------------- +Mon Mar 6 12:22:38 UTC 2017 - dnh@opensuse.org + +- Update to Version 4.8.19 + +** Core + * Replace $MC_HOME with $MC_PROFILE_ROOT (#3684) + * Allow rebind TAB key to change panel (#3672) + * Support for True Color (16 millions colors) (#3145) + * Color aliases in skin files (#3711) + +** VFS + * Support timestamps with nanosecond precision for copy/move operations (#3575) + * Introduce EXTFS helpers tester (#3730, #3744, #3752, #3753, #3751) + * Teach u7z to parse archive listings w/o sizes and/or dates (#2707) + * Teach rpm helper about transaction scripts (#3750) + * Fix hp48, uace & uarc extfs which used an obsolete date format (#3729, #3747) + +** Editor + * Syntax: + - updates of HTML and ebuild highlighting + - highlight *.t (Perl test) files as Perl scripts + - disassociate .cl file extension from LISP syntax (#3691) + * Add syntax highlighting: + - OpenCL (#3690) + - OpenShadingLanguage (#3762) + - R + - YAML (#3293) + +** Misc + * Code cleanup (#3693, #3703, #3721, #3763) + * Add true color skins: 'Four seasons' (#3724) + * Activate `--enable-tests` by default if `check` is found (#3708) + * Added new skin: YADT (MidnightCommander/mc#115) + +** Fixes + * Segfault on switching left panel to Info (#3700) + * Broken compatibility with ncurses (#3697) + * Setting MC_HOME makes mc ignore ~/.bashrc (#3684) + * mc_tmpdir() use a buffer of only 64 characters (#3736) + * Some bugs in the parsing of hexadecimal search patterns (#3694) + * Hexadecimal search fails on binary data (#3589) + * Broken file list resorting on double click on panel header line (#3715) + * Wrong dialog resizing and positioning (#3714, #3723) + * Widget's 'disabled' status is not toggled immediately (#3716) + * Last item of 'Options/Layout/Horizontal' radiobuttons remains highlighted (#3717) + * 'Options/Layout/Equal split' checkbox gets reverted (#3718) + * Panels: cannot show more than one "column" in user defined listing mode (#3757) + * Mix of MSG_NOTIFY and MSG_FOCUS messages (#3731) + * skins: 'window-state-char' and 'window-close-char' are parsed as colors (#3710) + * Pressing and in the hotlist dialog doesn't refresh it (#3775) + * mcview: an error message about bad regexp isn't shown (#3720) + * mcedit: fix etags filenames parsing (#3698) + * mcedit: fix mouse active area for maximize / close buttons (#3774) + * mcedit: frames (MDI interface) don't reflect the focus state (#3766) + * mcedit: frames (MDI interface) sometimes obscure the buttonbar (#3760) + * mcedit doesn't show search error messages when searching backwards (#3735) + * help viewer: tab characters handled incorrectly (#3754) + * VFS: incorrect zoo archive listing (#3696) + * VFS: segfault in VFSs not setting block size in stat (#3749) + +- removed obsolete patch#24: 02_ignore_ftp_chmod_error.patch + if ignore_ftp_chattr_errors=true (the default?) in + ~/.config/mc/ini, errors are ignored anyway, and if if set to false, + the user get the error (e.g. permission denied). With the patch, the + user never will see an error and wonder, why it's not working. It + might have been, that this option has not worked in (much) older + versions and the patch introduced because of this. + +- removed obsolete patch#31: 09_uzip_broken_528239.patch + it is correctly detected during configure + +- rebased patch#17 mc-rpm.patch + ------------------------------------------------------------------- Mon Oct 3 02:59:40 UTC 2016 - dnh@opensuse.org diff --git a/mc.spec b/mc.spec index ca2141c..6d4dcc5 100644 --- a/mc.spec +++ b/mc.spec @@ -1,7 +1,7 @@ # # spec file for package mc # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,11 +21,9 @@ Summary: Midnight Commander License: GPL-3.0+ Group: Productivity/File utilities Url: http://midnight-commander.org/ -Version: 4.8.18 +Version: 4.8.19 Release: 0 - -#Git-Clone: git://github.com/MidnightCommander/mc -Source: http://ftp.midnight-commander.org/mc-%{version}.tar.xz +Source0: http://ftp.midnight-commander.org/mc-%{version}.tar.xz Source1: x11_browser Source2: %{name}.desktop Source3: %{name}.png @@ -53,10 +51,7 @@ Patch22: mc-vfs-fish-deleted_source_file.patch # to reflect upstream fix Patch23: mc-extfs-iso9660-xorriso.patch -#debian fixes for vfs -Patch24: 02_ignore_ftp_chmod_error.patch #Debian fixes -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. Patch41: mc-multi-press-f-keys.patch @@ -85,6 +80,7 @@ BuildRequires: libpng-devel BuildRequires: libssh2-devel BuildRequires: readline-devel BuildRequires: slang-devel +BuildRequires: unzip BuildRequires: update-desktop-files BuildRequires: xdg-utils BuildRequires: xorg-x11-devel @@ -124,8 +120,6 @@ echo "`grep %{name}-%{version}.tar.xz %{SOURCE6} | head -n1 | cut -c1-64` %{SOU %patch21 %patch22 -p1 %patch23 -p0 -%patch24 -%patch31 %patch32 %patch41 -p1 %patch52 -p1