Accepting request 48136 from Base:System

Copy from Base:System/mc based on submit request 48136 from user psmt

OBS-URL: https://build.opensuse.org/request/show/48136
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mc?expand=0&rev=24

02_ignore_ftp_chmod_error.patch

@@ -1,8 +1,8 @@
 Index: lib/vfs/mc-vfs/ftpfs.c
 ===================================================================
---- lib/vfs/mc-vfs/ftpfs.c.orig	2010-07-05 21:12:51.000000000 +0200
+--- lib/vfs/mc-vfs/ftpfs.c.orig	2010-09-07 08:53:07.000000000 +0200
-+++ lib/vfs/mc-vfs/ftpfs.c	2010-07-07 11:52:54.995011197 +0200
++++ lib/vfs/mc-vfs/ftpfs.c	2010-09-14 15:58:24.445150391 +0200
-@@ -1669,7 +1669,7 @@ static int ftpfs_chmod (struct vfs_class
+@@ -1670,7 +1670,7 @@ static int ftpfs_chmod (struct vfs_class
  
      g_snprintf(buf, sizeof(buf), "SITE CHMOD %4.4o /%%s", mode & 07777);
  

20_wrong_path_to_wrappers.patch

@@ -9,7 +9,7 @@ Index: contrib/mc.csh.in
 +++ contrib/mc.csh.in	2010-07-07 18:54:54.616547000 +0200
 @@ -1 +1 @@
 -alias mc 'source @pkglibexecdir@/mc-wrapper.csh'
-+alias mc 'source @datadir@/mc/bin/mc-wrapper.csh'
++alias mc 'source @datadir@/mc/mc-wrapper.csh'
 Index: contrib/Makefile.am
 ===================================================================
 --- contrib/Makefile.am.orig	2010-07-05 21:12:51.000000000 +0200

mc-4.7.0.7.tar.lzma

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2bbc8ebb22054e4f761611b5ab850dd9d0260a2d1cf05bb1895b0ea24c9f68a0
-size 2070363

mc-4.7.0.9.tar.lzma

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d4223a5a5d0f891f9389da7f49e0d837cc409705dd68667418e4f986fef98204
+size 2100303

mc-wrapper.patch

@@ -1,16 +1,33 @@
 Index: contrib/mc.sh.in
 ===================================================================
 --- contrib/mc.sh.in.orig	2010-07-05 21:12:51.000000000 +0200
-+++ contrib/mc.sh.in	2010-07-06 19:10:33.155018811 +0200
++++ contrib/mc.sh.in	2010-09-14 12:43:40.906036450 +0200
 @@ -1,3 +1,10 @@
  # Don't define aliases in plain Bourne shell
  [ -n "${BASH_VERSION}${KSH_VERSION}${ZSH_VERSION}" ] || return 0
 -alias mc='. @pkglibexecdir@/mc-wrapper.sh'
 +mc()
 +{
-+. @datadir@/mc/mc-wrapper.sh'
++. @datadir@/mc/mc-wrapper.sh
 +}
 +if [ -n "$BASH_VERSION" ]
 +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

mc.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Tue Sep 14 15:45:42 CEST 2010 - pth@suse.de
+
+- Fix wrapper script for sh, change Makefile to substitute
+  datadir (bnc#639044).
+- Update to 4.7.0.9. Changes since 4.7.0.7:
+  * Translation updates.
+  * Added Galician translation.
+  * Fix potential division by zero in Info panel.
+  * Regexp replace only transforms the first occurence correctly.
+  * Fix remaining plain int types in VFS.
+  * Add "Toggle syntax highlighting" menu item.
+  * Fix restoring of signals even if fork() fails.
+  * Fix Segfault in replacement confirmation in editor. 
+
+-------------------------------------------------------------------
+Thu Sep  9 08:00:14 UTC 2010 - aj@suse.de
+
+- BuildRequire gpm-devel
+
 -------------------------------------------------------------------
 Wed Sep  8 15:50:28 UTC 2010 - pth@novell.com
 

mc.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package mc (Version 4.7.0.7)
+# spec file for package mc (Version 4.7.0.9)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -23,7 +23,7 @@ Summary:        Midnight Commander
 Group:          Productivity/File utilities
 License:        GPLv2+
 Url:            http://www.ibiblio.org/mc/
-Version:        4.7.0.7
+Version:        4.7.0.9
 Release:        1
 Source:         mc-%{version}.tar.lzma
 Source1:        x11_browser
@@ -51,14 +51,17 @@ Patch41:        mc-multi-press-f-keys.patch
 Patch50:        mc-extensions.patch
 Patch51:        mc-mcviewsegfault.patch
 Patch52:        mc-int_ptr_casts.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  audiofile-devel
 BuildRequires:  docbook-toys
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  fdupes
 BuildRequires:  glib2-devel
+%if 0%{?suse_version} > 1130
+BuildRequires:  gpm-devel
+%else
 BuildRequires:  gpm
+%endif
 BuildRequires:  indent
 BuildRequires:  jpeg
 BuildRequires:  libjpeg-devel