From 057a750167c8744fc135a3ab30c491ec201ff285812b3282a16aee2ea678d846 Mon Sep 17 00:00:00 2001 From: David Haller Date: Tue, 24 Mar 2015 22:08:23 +0000 Subject: [PATCH] Accepting request 292870 from home:AndreasStieger:branches:Base:System mc 4.8.14 OBS-URL: https://build.opensuse.org/request/show/292870 OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=94 --- mc-4.8.13.tar.xz | 3 --- mc-4.8.14.tar.xz | 3 +++ mc-wrapper.patch | 45 +++++++++++++++++++++++++-------------------- mc.changes | 25 +++++++++++++++++++++++++ mc.spec | 8 ++++---- 5 files changed, 57 insertions(+), 27 deletions(-) delete mode 100644 mc-4.8.13.tar.xz create mode 100644 mc-4.8.14.tar.xz diff --git a/mc-4.8.13.tar.xz b/mc-4.8.13.tar.xz deleted file mode 100644 index 00b6c17..0000000 --- a/mc-4.8.13.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:36d6191a47ec5d89d3788e48846fb620c481816441ff25264add8898d277b657 -size 2231448 diff --git a/mc-4.8.14.tar.xz b/mc-4.8.14.tar.xz new file mode 100644 index 0000000..9bfc46b --- /dev/null +++ b/mc-4.8.14.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b1f74efbdf394bfab084f4d2ea2e72173de5f12cd42be2533ca2c3b72edb8e6 +size 2305788 diff --git a/mc-wrapper.patch b/mc-wrapper.patch index 0a3e1af..d2f409e 100644 --- a/mc-wrapper.patch +++ b/mc-wrapper.patch @@ -1,7 +1,29 @@ -Index: contrib/mc.sh.in +--- + contrib/Makefile.am | 4 ++-- + contrib/mc.sh.in | 9 ++++++++- + 2 files changed, 10 insertions(+), 3 deletions(-) + +Index: mc-4.8.14/contrib/Makefile.am =================================================================== ---- contrib/mc.sh.in.orig 2010-07-05 21:12:51.000000000 +0200 -+++ contrib/mc.sh.in 2010-09-14 12:43:40.906036450 +0200 +--- mc-4.8.14.orig/contrib/Makefile.am 2015-03-24 19:02:18.000000000 +0100 ++++ mc-4.8.14/contrib/Makefile.am 2015-03-24 19:05:14.000000000 +0100 +@@ -22,10 +22,10 @@ EXTRA_DIST = \ + $(noinst_DATA) + + mc.csh: $(top_builddir)/config.status $(srcdir)/mc.csh.in +- sed "s%@""pkglibexecdir@%$(pkglibexecdir)%" $(srcdir)/mc.csh.in > mc.csh ++ sed "s%@""datadir@%$(datadir)%" $(srcdir)/mc.csh.in > mc.csh + + mc.sh: $(top_builddir)/config.status $(srcdir)/mc.sh.in +- sed "s%@""pkglibexecdir@%$(pkglibexecdir)%" $(srcdir)/mc.sh.in > mc.sh ++ sed "s%@""datadir@%$(datadir)%" $(srcdir)/mc.sh.in > mc.sh + + mc-wrapper.csh: $(top_builddir)/config.status $(srcdir)/mc-wrapper.csh.in + sed "s%@""bindir@%$(bindir)%" $(srcdir)/mc-wrapper.csh.in > mc-wrapper.csh +Index: mc-4.8.14/contrib/mc.sh.in +=================================================================== +--- mc-4.8.14.orig/contrib/mc.sh.in 2015-03-24 19:01:42.000000000 +0100 ++++ mc-4.8.14/contrib/mc.sh.in 2015-03-24 19:02:18.000000000 +0100 @@ -1,3 +1,10 @@ # Don't define aliases in plain Bourne shell [ -n "${BASH_VERSION}${KSH_VERSION}${ZSH_VERSION}" ] || return 0 @@ -14,20 +36,3 @@ Index: contrib/mc.sh.in +then + export -f mc +fi -Index: contrib/Makefile.am -=================================================================== ---- contrib/Makefile.am.orig 2010-09-14 12:43:45.000000000 +0200 -+++ contrib/Makefile.am 2010-09-14 12:47:16.291629539 +0200 -@@ -22,10 +22,10 @@ EXTRA_DIST = \ - $(noinst_DATA) - - mc.csh: $(srcdir)/mc.csh.in -- sed "s%@""pkglibexecdir@%$(pkglibexecdir)%" $(srcdir)/mc.csh.in > mc.csh -+ sed "s%@""datadir@%$(datadir)%" $(srcdir)/mc.csh.in > mc.csh - - mc.sh: $(srcdir)/mc.sh.in -- sed "s%@""pkglibexecdir@%$(pkglibexecdir)%" $(srcdir)/mc.sh.in > mc.sh -+ sed -e "s%@""datadir@%$(datadir)%" $(srcdir)/mc.sh.in > mc.sh - - mc-wrapper.csh: $(srcdir)/mc-wrapper.csh.in - sed "s%@""bindir@%$(bindir)%" $(srcdir)/mc-wrapper.csh.in > mc-wrapper.csh diff --git a/mc.changes b/mc.changes index f43daa2..c000faa 100644 --- a/mc.changes +++ b/mc.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Tue Mar 24 18:45:13 UTC 2015 - astieger@suse.com + +- GNU Midnight Commander 4.8.14: + * Core: + + Minimal version of GLib is 2.14.0 + + Add new panel binding "SelectExt" to select/unselect files + with the same extension as the current file + + Speed up of directory size calculation + + Support of italic text + * Editor: + + New syntax highlighting support: puppet + * Viewer: + + Rewrite mcview's rendering and scrolling + + Use VIEW_SELECTED_COLOR in plain mode + + In QuickView panel, don't pass any chars to command line to + avoid unexpected command execution + * Misc: + + Code cleanup + + Bind poedit to Edit action for .po files + + Better grammar mcedit user menu + * Various bug fixes + +------------------------------------------------------------------- + Sat Sep 6 01:40:44 UTC 2014 - dnh@opensuse.org - remove file mc-Syntax.cmake.patch / cmds in .spec diff --git a/mc.spec b/mc.spec index 6559a56..895408d 100644 --- a/mc.spec +++ b/mc.spec @@ -1,7 +1,7 @@ # # spec file for package mc # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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,7 +21,7 @@ Summary: Midnight Commander License: GPL-3.0+ Group: Productivity/File utilities Url: http://midnight-commander.org/ -Version: 4.8.13 +Version: 4.8.14 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 +BuildRequires: glib2-devel >= 2.14.0 BuildRequires: libtool %if 0%{?suse_version} > 1130 BuildRequires: gpm-devel @@ -114,7 +114,7 @@ isoinfo (from mkisofs) or xorriso for the iso:// extension. %patch64 %patch69 %patch71 -%patch12 +%patch12 -p1 %patch16 %patch17 -p1 %patch20