From 3faf2d182f27a0064dfdbe08717f47996cdc3e24072a3c62747d14ca496d97d7 Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Wed, 11 May 2016 09:40:29 +0000 Subject: [PATCH] =?UTF-8?q?-=20Update=20to=204.8.17:=20=3D=3D=3D=20Core=20?= =?UTF-8?q?=3D=3D=3D=20=20=20*=20Minimal=20version=20of=20Gettext=20is=200?= =?UTF-8?q?.18.1=20(#1885)=20=20=20*=20Optimization=20of=20copy/move=20ope?= =?UTF-8?q?rations=20(use=20adaptive=20buffer=20as=20in=20coreutils)=20(#2?= =?UTF-8?q?193)=20=20=20*=20Recognize=20csh=20as=20tcsh=20(#2742)=20=20=20?= =?UTF-8?q?*=20=D0=A1entered=20scrolling=20of=20file=20panel=20(#3130)=20?= =?UTF-8?q?=20=20*=20Internals:=20=20=20=20=20*=20Switch=20to=20new=20high?= =?UTF-8?q?-level=20mouse=20API=20(#3571)=20=3D=3D=3D=20VFS=20=3D=3D=3D=20?= =?UTF-8?q?=20=20*=20FISH=20helpers:=20remove=20executable=20bit=20(#3610)?= =?UTF-8?q?=20=3D=3D=3D=20Editor=20=3D=3D=3D=20=20=20*=20Improvements=20of?= =?UTF-8?q?=20syntax=20highlighting:=20=20=20=20=20*=20F90=20(#3618)=20=20?= =?UTF-8?q?=20=20=20*=20Java=20(MidnightCommander/mc#95)=20=3D=3D=3D=20Mis?= =?UTF-8?q?c=20=3D=3D=3D=20=20=20*=20Code=20cleanup=20(#3598,=20#3607)=20?= =?UTF-8?q?=20=20*=20Install=20mc.keymap=20as=20a=20symlink=20to=20mc.defa?= =?UTF-8?q?ult.keymap=20(#3609)=20=20=20*=20File=20highlight:=20add=20more?= =?UTF-8?q?=20common=20file=20formats=20=3D=3D=3D=20Fixes=20=3D=3D=3D=20?= =?UTF-8?q?=20=20*=20Segfault=20due=20to=20incorrect=20value=20of=20SHELL?= =?UTF-8?q?=20environment=20variable=20(#3606)=20=20=20*=20Segfault=20when?= =?UTF-8?q?=20copying=20files=20under=20FreeBSD=209.3=20(#3617)=20=20=20*?= =?UTF-8?q?=20Segfault=20when=20entering=20into=20some=20cpio=20archives?= =?UTF-8?q?=20(#3621)=20=20=20*=20Subshell=20output=20lost=20on=20window?= =?UTF-8?q?=20resize=20under=20tmux,=20GNU=20screen=20(#3639)=20=20=20*=20?= =?UTF-8?q?Subshell=20cursor=20position=20lost=20after=20window=20resizing?= =?UTF-8?q?=20(#3640)=20=20=20*=20Listbox=20no=20longer=20scrolls=20when?= =?UTF-8?q?=20dragging=20outside=20widget=20(#3559)=20=20=20*=20VFS:=20ext?= =?UTF-8?q?fs:=20incorrect=20date=20parsing=20in=20unzip=20(#3622)=20=20?= =?UTF-8?q?=20*=20VFS:=20extfs:=20buffer=20overflow=20(#3605)=20=20=20*=20?= =?UTF-8?q?VFS:=20patchfs:=20syntax=20error=20(#3620)=20=20=20*=20VFS:=20f?= =?UTF-8?q?ish:=20mistakes=20in=20ls=20Perl=20helper=20(#3611)=20-=20remov?= =?UTF-8?q?e=20upstreamed=20Patch99:=20mc-patchfs=5Flzip-syntax-error.patc?= =?UTF-8?q?h?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=104 --- mc-4.8.16.sha256 | 2 -- mc-4.8.16.tar.xz | 3 -- mc-4.8.17.sha256 | 2 ++ mc-4.8.17.tar.xz | 3 ++ mc-patchfs_lzip-syntax-error.patch | 28 ------------------- mc.changes | 44 ++++++++++++++++++++++++++++-- mc.spec | 13 ++------- 7 files changed, 48 insertions(+), 47 deletions(-) delete mode 100644 mc-4.8.16.sha256 delete mode 100644 mc-4.8.16.tar.xz create mode 100644 mc-4.8.17.sha256 create mode 100644 mc-4.8.17.tar.xz delete mode 100644 mc-patchfs_lzip-syntax-error.patch diff --git a/mc-4.8.16.sha256 b/mc-4.8.16.sha256 deleted file mode 100644 index 187b5f6..0000000 --- a/mc-4.8.16.sha256 +++ /dev/null @@ -1,2 +0,0 @@ -c37ea495df93f6d375a3ce59cdcf0f3a3690338526205347b03a316daebdaaf8 mc-4.8.16.tar.bz2 -bbbcbe3097d3160f865d24aa38ff122f1c59752b5ef153ca4ade5ac0f82b7020 mc-4.8.16.tar.xz diff --git a/mc-4.8.16.tar.xz b/mc-4.8.16.tar.xz deleted file mode 100644 index 60da81a..0000000 --- a/mc-4.8.16.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bbbcbe3097d3160f865d24aa38ff122f1c59752b5ef153ca4ade5ac0f82b7020 -size 2387724 diff --git a/mc-4.8.17.sha256 b/mc-4.8.17.sha256 new file mode 100644 index 0000000..16193a8 --- /dev/null +++ b/mc-4.8.17.sha256 @@ -0,0 +1,2 @@ +66d0cb37baaed8ef930f8ad25a634adad4f264eb61820893920ac87b9dfb783b mc-4.8.17.tar.bz2 +0447bdddc0baa81866e66f50f9a545d29d6eebb68b0ab46c98d8fddd2bf4e44d mc-4.8.17.tar.xz diff --git a/mc-4.8.17.tar.xz b/mc-4.8.17.tar.xz new file mode 100644 index 0000000..3c2b282 --- /dev/null +++ b/mc-4.8.17.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0447bdddc0baa81866e66f50f9a545d29d6eebb68b0ab46c98d8fddd2bf4e44d +size 2457156 diff --git a/mc-patchfs_lzip-syntax-error.patch b/mc-patchfs_lzip-syntax-error.patch deleted file mode 100644 index b1a4f99..0000000 --- a/mc-patchfs_lzip-syntax-error.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- src/vfs/extfs/helpers/patchfs.in -+++ src/vfs/extfs/helpers/patchfs.in -@@ -80,10 +80,10 @@ - my ($qfname)=(quotemeta $_[0]); - - $_=`$fileutil $qfname`; -- } elsif (/^'*lzip/) { -- return "$lzip -dc $qfname"; - if (/^'*lz4/) { - return "$lz4 -dc $qfname"; -+ } elsif (/^'*lzip/) { -+ return "$lzip -dc $qfname"; - } elsif (/^'*lzma/) { - return "$lzma -dc $qfname"; - } elsif (/^'*xz/) { -@@ -104,10 +104,10 @@ - my ($sep) = $append ? '>>' : '>'; - - $_=`$fileutil $qfname`; -- } elsif (/^'*lzip/) { -- return "$lzip -c $sep $qfname"; - if (/^'*lz4/) { - return "$lz4 -c $sep $qfname"; -+ } elsif (/^'*lzip/) { -+ return "$lzip -c $sep $qfname"; - } elsif (/^'*lzma/) { - return "$lzma -c $sep $qfname"; - } elsif (/^'*xz/) { diff --git a/mc.changes b/mc.changes index da0efdd..174baab 100644 --- a/mc.changes +++ b/mc.changes @@ -1,3 +1,43 @@ +------------------------------------------------------------------- +Mon May 9 19:05:12 UTC 2016 - dnh@opensuse.org + +- Update to 4.8.17: + +=== Core === + * Minimal version of Gettext is 0.18.1 (#1885) + * Optimization of copy/move operations (use adaptive buffer as in coreutils) (#2193) + * Recognize csh as tcsh (#2742) + * Сentered scrolling of file panel (#3130) + * Internals: + * Switch to new high-level mouse API (#3571) + +=== VFS === + * FISH helpers: remove executable bit (#3610) + +=== Editor === + * Improvements of syntax highlighting: + * F90 (#3618) + * Java (MidnightCommander/mc#95) + +=== Misc === + * Code cleanup (#3598, #3607) + * Install mc.keymap as a symlink to mc.default.keymap (#3609) + * File highlight: add more common file formats + +=== Fixes === + * Segfault due to incorrect value of SHELL environment variable (#3606) + * Segfault when copying files under FreeBSD 9.3 (#3617) + * Segfault when entering into some cpio archives (#3621) + * Subshell output lost on window resize under tmux, GNU screen (#3639) + * Subshell cursor position lost after window resizing (#3640) + * Listbox no longer scrolls when dragging outside widget (#3559) + * VFS: extfs: incorrect date parsing in unzip (#3622) + * VFS: extfs: buffer overflow (#3605) + * VFS: patchfs: syntax error (#3620) + * VFS: fish: mistakes in ls Perl helper (#3611) + +- remove upstreamed Patch99: mc-patchfs_lzip-syntax-error.patch + ------------------------------------------------------------------- Fri Apr 1 07:41:30 CEST 2016 - dnh@opensuse.org @@ -13,9 +53,7 @@ Core Support for ash + bugfixes for bash, fish (#2742) Find file: empty file name matches any file name (#3593) - Find file: empty value of "Content" is used instead of - "Search for content" checkbox to disable search - for content (#3594) + Find file: empty value of "Content" is used instead of "Search for content" checkbox to disable search for content (#3594) Listbox: don't wraparound on mouse scroll (#3554) Internals: Listbox: various fixups (#3569: #3562, #3563, #3565, #3161) diff --git a/mc.spec b/mc.spec index 88142e8..440c928 100644 --- a/mc.spec +++ b/mc.spec @@ -21,7 +21,7 @@ Summary: Midnight Commander License: GPL-3.0+ Group: Productivity/File utilities Url: http://midnight-commander.org/ -Version: 4.8.16 +Version: 4.8.17 Release: 0 #Git-Clone: git://github.com/MidnightCommander/mc @@ -44,11 +44,6 @@ Patch16: mc-esc-seq.patch Patch17: mc-rpm.patch Patch20: mc-f-keys.patch Patch21: mc-extfs-helpers-deb.patch -# temporarily add fix from upstream until 4.8.17 -# https://bugzilla.opensuse.org/show_bug.cgi?id=972789 -# https://github.com/MidnightCommander/mc/issues/93 -# https://midnight-commander.org/ticket/3620 -Patch99: mc-patchfs_lzip-syntax-error.patch # add patch. bnc#856501 # http://www.midnight-commander.org/ticket/3128 @@ -75,6 +70,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: audiofile-devel BuildRequires: e2fsprogs-devel BuildRequires: fdupes +BuildRequires: gettext >= 0.18.1 BuildRequires: glib2-devel >= 2.26.0 BuildRequires: libtool %if 0%{?suse_version} > 1130 @@ -135,8 +131,6 @@ echo "`grep %{name}-%{version}.tar.xz %{SOURCE6} | head -n1 | cut -c1-64` %{SOU %patch52 -p1 %patch60 -p1 -%patch99 -p0 - %build autoreconf --force --install %define warn_flags -W -Wall -Wstrict-prototypes -Wpointer-arith -Wformat-security -Wno-unused-parameter @@ -202,7 +196,6 @@ rm -rf %{buildroot}%{_datadir}/locale/be@tarask %config %{_sysconfdir}/mc/sfs.ini %config %{_sysconfdir}/mc/mc.menu %config %{_sysconfdir}/mc/mc.ext -###config #{_sysconfdir}/mc/edit.spell.rc %config %{_sysconfdir}/mc/mcedit.menu %config %{_sysconfdir}/mc/mc.keymap %config %{_sysconfdir}/mc/mc.default.keymap @@ -222,7 +215,6 @@ rm -rf %{buildroot}%{_datadir}/locale/be@tarask %exclude %{_datadir}/mc/hints/mc.hint.* %{_datadir}/mc/help/mc.hlp %exclude %{_datadir}/mc/help/mc.hlp.* -%exclude %{_sysconfdir}/mc/mc.menu.* %exclude %{_datadir}/locale/*/LC_MESSAGES/mc.mo %{_datadir}/applications/%{name}.desktop @@ -231,7 +223,6 @@ rm -rf %{buildroot}%{_datadir}/locale/be@tarask %dir %{_datadir}/icons/hicolor/32x32 %dir %{_datadir}/icons/hicolor/32x32/apps %{_datadir}/icons/hicolor/32x32/apps/%{name}.png -%exclude %{_sysconfdir}/mc/mc.menu.* %files lang -f %name.lang %defattr(-, root, root)