From 16203d929aa28b7604d94f9d2b73f76bc9e5c504608f4a5d4722e19250ed0935 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Mon, 9 Nov 2015 10:56:56 +0000
Subject: [PATCH 1/3] Accepting request 343072 from
 home:dnh:branches:Base:System

*argh* forgot the glib minversion in the .spec

OBS-URL: https://build.opensuse.org/request/show/343072
OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=96
---
 mc-4.8.14.tar.xz  |  3 ---
 mc-4.8.15.sha256  |  2 ++
 mc-4.8.15.tar.xz  |  3 +++
 mc-extd-xdg.patch | 36 ++++++++++++++++++------------------
 mc.changes        | 41 +++++++++++++++++++++++++++++++++++++++++
 mc.spec           |  4 ++--
 6 files changed, 66 insertions(+), 23 deletions(-)
 delete mode 100644 mc-4.8.14.tar.xz
 create mode 100644 mc-4.8.15.sha256
 create mode 100644 mc-4.8.15.tar.xz

diff --git a/mc-4.8.14.tar.xz b/mc-4.8.14.tar.xz
deleted file mode 100644
index 9bfc46b..0000000
--- a/mc-4.8.14.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6b1f74efbdf394bfab084f4d2ea2e72173de5f12cd42be2533ca2c3b72edb8e6
-size 2305788
diff --git a/mc-4.8.15.sha256 b/mc-4.8.15.sha256
new file mode 100644
index 0000000..a095bb6
--- /dev/null
+++ b/mc-4.8.15.sha256
@@ -0,0 +1,2 @@
+f74e3da70410975cdeb27ee9a66d1dd812250b6d3ede364bca728dd5a48e5471  mc-4.8.15.tar.bz2
+cf4e8f5dfe419830d56ca7e5f2495898e37ebcd05da1e47ff7041446c87fba16  mc-4.8.15.tar.xz
diff --git a/mc-4.8.15.tar.xz b/mc-4.8.15.tar.xz
new file mode 100644
index 0000000..eb0a7f3
--- /dev/null
+++ b/mc-4.8.15.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cf4e8f5dfe419830d56ca7e5f2495898e37ebcd05da1e47ff7041446c87fba16
+size 2304812
diff --git a/mc-extd-xdg.patch b/mc-extd-xdg.patch
index 169ec17..077ee76 100644
--- a/mc-extd-xdg.patch
+++ b/mc-extd-xdg.patch
@@ -3,70 +3,70 @@ diff -ru1 misc/ext.d.orig/archive.sh misc/ext.d/archive.sh
 +++ misc/ext.d/archive.sh	2013-03-10 09:01:31.154705008 +0400
 @@ -145,3 +145,3 @@
  open)
--    "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
-+    [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
+-    ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
++    [ -n "$DISPLAY" ] && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
          do_open_action "${filetype}" "${pager}"
 diff -ru1 misc/ext.d.orig/doc.sh.in misc/ext.d/doc.sh.in
 --- misc/ext.d.orig/doc.sh.in	2012-12-27 12:13:20.000000000 +0400
 +++ misc/ext.d/doc.sh.in	2013-03-10 09:01:48.230710602 +0400
 @@ -189,3 +189,3 @@
  open)
--    "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
-+    [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
+-    ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
++    [ -n "$DISPLAY" ] && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
          do_open_action "${filetype}"
 diff -ru1 misc/ext.d.orig/image.sh misc/ext.d/image.sh
 --- misc/ext.d.orig/image.sh	2012-12-27 12:13:20.000000000 +0400
 +++ misc/ext.d/image.sh	2013-03-10 09:02:00.086714848 +0400
 @@ -56,3 +56,3 @@
  open)
--    "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
-+    [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
+-    ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
++    [ -n "$DISPLAY" ] && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
          do_open_action "${filetype}"
 diff -ru1 misc/ext.d.orig/misc.sh.in misc/ext.d/misc.sh.in
 --- misc/ext.d.orig/misc.sh.in	2012-12-27 12:13:20.000000000 +0400
 +++ misc/ext.d/misc.sh.in	2013-03-10 09:02:13.470718625 +0400
 @@ -90,3 +90,3 @@
  open)
--    "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
-+    [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
+-    ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
++    [ -n "$DISPLAY" ] && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
          do_open_action "${filetype}"
 diff -ru1 misc/ext.d.orig/package.sh misc/ext.d/package.sh
 --- misc/ext.d.orig/package.sh	2012-12-27 12:13:20.000000000 +0400
 +++ misc/ext.d/package.sh	2013-03-10 09:02:23.630723087 +0400
 @@ -53,3 +53,3 @@
  open)
--    "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
-+    [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
+-    ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
++    [ -n "$DISPLAY" ] && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
          do_open_action "${filetype}"
 diff -ru1 misc/ext.d.orig/sound.sh misc/ext.d/sound.sh
 --- misc/ext.d.orig/sound.sh	2012-12-27 12:13:20.000000000 +0400
 +++ misc/ext.d/sound.sh	2013-03-10 09:02:31.222725342 +0400
 @@ -86,3 +86,3 @@
  open)
--    "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
-+    [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
+-    ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
++    [ -n "$DISPLAY" ] && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
          do_open_action "${filetype}"
 diff -ru1 misc/ext.d.orig/text.sh.in misc/ext.d/text.sh.in
 --- misc/ext.d.orig/text.sh.in	2012-12-27 12:13:20.000000000 +0400
 +++ misc/ext.d/text.sh.in	2013-03-10 09:02:39.018727707 +0400
 @@ -135,3 +135,3 @@
  open)
--    "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
-+    [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
+-    ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
++    [ -n "$DISPLAY" ] && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
          do_open_action "${filetype}" "${pager}"
 diff -ru1 misc/ext.d.orig/video.sh misc/ext.d/video.sh
 --- misc/ext.d.orig/video.sh	2012-12-27 12:13:20.000000000 +0400
 +++ misc/ext.d/video.sh	2013-03-10 09:02:48.414731630 +0400
 @@ -45,3 +45,3 @@
  open)
--    "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
-+    [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
+-    ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
++    [ -n "$DISPLAY" ] && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
          do_open_action "${filetype}"
 diff -ru1 misc/ext.d.orig/web.sh.in misc/ext.d/web.sh.in
 --- misc/ext.d.orig/web.sh.in	2012-12-27 12:13:20.000000000 +0400
 +++ misc/ext.d/web.sh.in	2013-03-10 09:02:56.670734093 +0400
 @@ -48,3 +48,3 @@
  open)
--    "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
-+    [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
+-    ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
++    [ -n "$DISPLAY" ] && ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \
          do_open_action "${filetype}"
diff --git a/mc.changes b/mc.changes
index c000faa..739043f 100644
--- a/mc.changes
+++ b/mc.changes
@@ -1,3 +1,44 @@
+-------------------------------------------------------------------
+Mon Nov  9 05:26:47 UTC 2015 - dnh@opensuse.org
+
+- Update to 4.8.15:
+
+* Core:
+    Minimal version of GLib is 2.26.0
+    Use the PATH environment variable to search for the executable when opening pipe (#3444)
+    Support more than 2 (up to 9) columns in file panel in brief mode (#3212)
+    Clarify file sorting in "Unsorted" mode (#3496)
+    WGroupbox: respect dialog's colors (#3468)
+    Highlight find file's result in internal viewer (#3530) 
+* VFS:
+    s3 extfs vfs: bugfixes and improvements (#3470, #3502) 
+* Editor:
+    Add hidden option to choose full or base file name in the status line (#3445)
+    Improvements of syntax highlighting:
+        Lua (#3471)
+        PKGBUILD (#3484)
+* Misc:
+    Text alignment in Info panel (#3155)
+    Select of menu file edit: change default button to "User" (#3493)
+    Recognize .gmo files as well as .mo ones (#3422)
+    Fix mc.pot comment tripping up Transifex and unportable inplace sed (#3479)
+    A lot of code clean up (#3420, #3424, #3426, #3427, #3428, #3429, #3430, #3431, #3434, #3435, #3437, #3463, #3464, #3465, #3466, #3467, #3494, #3495, #3539)
+    Documentation updates:
+        Spanish man and help: Diff Viewer section and minor fixes (#3477)
+        VFS garbage collection (#3472) 
+
+* Fixes:
+    Various memory leaks (#3438, #3439, #3440, #3457, #3458, #3459, #3460, #3461, #3462, #3475, #3520, #3521, #3522)
+    Linux kernel-specific segfault on startup (#3441)
+    Lost of Panelize contents in some cases (#3032, #3489, #3498, #3507)
+    Wrong highlight of search result in case of "Regular expression" and "Whole words" (#3524)
+    "Whole words" search works only in Normal mode (#3525)
+    SFTP VFS: segfault (#3456)
+    Segfault in "Find file" due to invalid UTF-8 sequences (#3449)
+    Bash variable 'PROMPT_COMMAND' in pantheon-terminal (#3534)
+
+- rebased mc-extd-xdg.patch against upstream changes
+
 -------------------------------------------------------------------
 Tue Mar 24 18:45:13 UTC 2015 - astieger@suse.com
 
diff --git a/mc.spec b/mc.spec
index 895408d..5f76e6d 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.14
+Version:        4.8.15
 Release:        0
 
 #Git-Clone:	git://github.com/MidnightCommander/mc
@@ -69,7 +69,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  audiofile-devel
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  fdupes
-BuildRequires:  glib2-devel >= 2.14.0
+BuildRequires:  glib2-devel >= 2.26.0
 BuildRequires:  libtool
 %if 0%{?suse_version} > 1130
 BuildRequires:  gpm-devel

From dc60338bc4b25e16103c5f9004707dff3e04ce7fe2e642d29142012d45f72ff2 Mon Sep 17 00:00:00 2001
From: Philipp Thomas <pth@suse.com>
Date: Mon, 9 Nov 2015 11:06:31 +0000
Subject: [PATCH 2/3] - Tag .sha256 file as source.

OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=97
---
 mc.changes | 5 +++++
 mc.spec    | 1 +
 2 files changed, 6 insertions(+)

diff --git a/mc.changes b/mc.changes
index 739043f..2507995 100644
--- a/mc.changes
+++ b/mc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov  9 12:05:44 CET 2015 - pth@suse.de
+
+- Tag .sha256 file as source.
+
 -------------------------------------------------------------------
 Mon Nov  9 05:26:47 UTC 2015 - dnh@opensuse.org
 
diff --git a/mc.spec b/mc.spec
index 5f76e6d..b792fa8 100644
--- a/mc.spec
+++ b/mc.spec
@@ -31,6 +31,7 @@ Source2:        %{name}.desktop
 Source3:        %{name}.png
 Source4:        cmake.syntax
 Source5:        mc-rpmlintrc
+Source6:        %{name}-%{version}.sha256
 Patch0:         mc-fix_lib_search_path.patch
 Patch61:        mc-extd-misc.patch
 Patch62:        mc-extd-video.patch

From a0b406e843064af1af07292861158556ef7666abbf200abd1c622e2e66f5e1ec Mon Sep 17 00:00:00 2001
From: OBS User mrdocs <null@suse.de>
Date: Tue, 10 Nov 2015 01:47:49 +0000
Subject: [PATCH 3/3] Accepting request 343173 from
 home:AndreasStieger:branches:Base:System

- verify the sha256 hash during build

OBS-URL: https://build.opensuse.org/request/show/343173
OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=98
---
 mc.changes | 5 +++++
 mc.spec    | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/mc.changes b/mc.changes
index 2507995..05e2d2c 100644
--- a/mc.changes
+++ b/mc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov  9 12:14:47 UTC 2015 - astieger@suse.com
+
+- verify the sha256 hash during build
+
 -------------------------------------------------------------------
 Mon Nov  9 12:05:44 CET 2015 - pth@suse.de
 
diff --git a/mc.spec b/mc.spec
index b792fa8..f34c05e 100644
--- a/mc.spec
+++ b/mc.spec
@@ -31,7 +31,7 @@ Source2:        %{name}.desktop
 Source3:        %{name}.png
 Source4:        cmake.syntax
 Source5:        mc-rpmlintrc
-Source6:        %{name}-%{version}.sha256
+Source6:        http://ftp.midnight-commander.org/%{name}-%{version}.sha256
 Patch0:         mc-fix_lib_search_path.patch
 Patch61:        mc-extd-misc.patch
 Patch62:        mc-extd-video.patch
@@ -107,6 +107,7 @@ isoinfo (from mkisofs) or xorriso for the iso:// extension.
 
 %lang_package
 %prep
+echo "`grep %{name}-%{version}.tar.xz %{SOURCE6} | head -n1 | cut -c1-64`  %{SOURCE0}" | sha256sum -c
 %setup -q
 %patch0
 %patch61