From c475f7e8719492ad64d30e01644f71f85c3e657b7a20cd6a191d9ce1f06fe654 Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Fri, 1 Apr 2016 05:52:57 +0000 Subject: [PATCH] Accepting request 382761 from home:psmt Add the missing .changes entry OBS-URL: https://build.opensuse.org/request/show/382761 OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=102 --- mc-patchfs_lzip-syntax-error.patch | 28 ++++++++++++++++++++++++++++ mc.changes | 10 +++++++++- mc.spec | 7 +++++++ 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 mc-patchfs_lzip-syntax-error.patch diff --git a/mc-patchfs_lzip-syntax-error.patch b/mc-patchfs_lzip-syntax-error.patch new file mode 100644 index 0000000..b1a4f99 --- /dev/null +++ b/mc-patchfs_lzip-syntax-error.patch @@ -0,0 +1,28 @@ +--- 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 ca8a607..da0efdd 100644 --- a/mc.changes +++ b/mc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 1 07:41:30 CEST 2016 - dnh@opensuse.org + +- Add no-brainer patch mc-patchfs_lzip-syntax-error.patch from upstream + that fixes a syntax error in the patchfs helper script (bsc#972789). + ------------------------------------------------------------------- Mon Mar 14 03:27:15 UTC 2016 - dnh@opensuse.org @@ -7,7 +13,9 @@ 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 bc5d582..88142e8 100644 --- a/mc.spec +++ b/mc.spec @@ -44,6 +44,11 @@ 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 @@ -130,6 +135,8 @@ 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