Hello community,

here is the log from the commit of package mc for openSUSE:Factory checked in 
at 2016-04-05 10:43:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mc (Old)
 and      /work/SRC/openSUSE:Factory/.mc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "mc"

Changes:
--------
--- /work/SRC/openSUSE:Factory/mc/mc.changes    2016-03-17 16:48:42.000000000 
+0100
+++ /work/SRC/openSUSE:Factory/.mc.new/mc.changes       2016-04-05 
10:43:15.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Apr  1 07:41:30 CEST 2016 - [email protected]
+
+- Add no-brainer patch mc-patchfs_lzip-syntax-error.patch from upstream
+  that fixes a syntax error in the patchfs helper script (bsc#972789). 
+
+-------------------------------------------------------------------
@@ -10 +16,3 @@
-    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)

New:
----
  mc-patchfs_lzip-syntax-error.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ mc.spec ++++++
--- /var/tmp/diff_new_pack.QGvMip/_old  2016-04-05 10:43:16.000000000 +0200
+++ /var/tmp/diff_new_pack.QGvMip/_new  2016-04-05 10:43:16.000000000 +0200
@@ -44,6 +44,11 @@
 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 @@
 %patch52 -p1
 %patch60 -p1
 
+%patch99 -p0
+
 %build
 autoreconf --force --install
 %define warn_flags -W -Wall -Wstrict-prototypes -Wpointer-arith 
-Wformat-security -Wno-unused-parameter

++++++ mc-patchfs_lzip-syntax-error.patch ++++++
--- 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/) {


Reply via email to