mc-4.8.16-2.parabola1: fix FS#48612 -> https://bugs.archlinux.org/task/48612

1 files changed, 38 insertions, 49 deletions

diff --git a/libre/mc/PKGBUILD b/libre/mc/PKGBUILD
index 2251b07fa..9ca932a45 100644
--- a/libre/mc/PKGBUILD
+++ b/libre/mc/PKGBUILD
@@ -1,80 +1,69 @@
-# $Id: PKGBUILD 166430 2016-03-12 22:15:15Z schuay $
-# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
+# $Id: PKGBUILD 167029 2016-03-17 15:09:36Z schuay $
 # Maintainer (Arch): schuay <jakob.gruber@gmail.com>
+# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
 pkgname=mc
 pkgver=4.8.16
-pkgrel=1.parabola1
+pkgrel=2.parabola1
 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander, with arj recommendation included and nonfree unace and unrar support removed"
 arch=('i686' 'x86_64' 'armv7h')
 url="http://www.ibiblio.org/mc/"
 license=('GPL')
-depends=(
-    'e2fsprogs'
-    'glib2'
-    'gpm'
-    'libssh2'
-    'slang')
-makedepends=('libxt' 'libx11')
-optdepends=(
-    'cabextract: ucab extfs'
-    'cdparanoia: audio extfs'
-    'cdrkit: iso9660 extfs'
-    'gawk: hp48+ extfs'
-    'aspell: spelling corrections'
-    'cvs: CVS support'
-    'mtools: a+ extfs'
-    'perl: needed by several extfs scripts'
-    'python2-boto: s3+ extfs'
-    'python2-pytz: s3+ extfs'
-    'samba: VFS support'
-    'arj: uarj extfs'
-    'zip: uzip extfs'
-    'p7zip: support for 7zip archives')
+depends=('e2fsprogs' 'glib2' 'gpm' 'libssh2' 'slang')
+makedepends=('libxt' 'libx11' 'unzip')
+optdepends=('aspell: spelling corrections'
+            'cabextract: ucab extfs'
+            'cdparanoia: audio extfs'
+            'cdrkit: iso9660 extfs'
+            'cvs: CVS support'
+            'gawk: hp48+ extfs'
+            'mtools: a+ extfs'
+            'p7zip: support for 7zip archives'
+            'perl: needed by several extfs scripts'
+            'python2-boto: s3+ extfs'
+            'python2-pytz: s3+ extfs'
+            'samba: VFS support'
+            'arj: uarj extfs'
+            'zip: uzip extfs')
 conflicts=('mc-libre')
 replaces=('mc-libre')
-options=('!emptydirs' '!makeflags')
 backup=('etc/mc/edit.indent.rc'
         'etc/mc/filehighlight.ini'
-        'etc/mc/mcedit.menu'
         'etc/mc/mc.ext'
         'etc/mc/mc.keymap'
         'etc/mc/mc.menu'
+        'etc/mc/mcedit.menu'
         'etc/mc/sfs.ini')
-source=("http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2"
+options=('!emptydirs')
+source=("http://ftp.midnight-commander.org/${pkgname}-${pkgver}.tar.xz"
         'libre.patch')
+sha256sums=('bbbcbe3097d3160f865d24aa38ff122f1c59752b5ef153ca4ade5ac0f82b7020'
+            '2d05fa0bc5c6e5022a2d45a3cf1481c70da9f164c341d4204fa8506b6ce9f0d3')
 
 prepare() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
 
-    patch -Np1 -i ../libre.patch
-    rm -v src/vfs/extfs/helpers/u{ace,rar}.in
+  patch -Np1 -i ../libre.patch
+  rm -v src/vfs/extfs/helpers/u{ace,rar}.in
 }
 
 
 build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-
-    ./configure --prefix=/usr --sysconfdir=/etc --enable-vfs-smb \
-        --with-x --libexecdir=/usr/lib
+  export PYTHON=/usr/bin/python2
 
-    make
+  cd ${pkgname}-${pkgver}
+  ./configure \
+      --prefix=/usr \
+      --libexecdir=/usr/lib \
+      --sysconfdir=/etc \
+      --enable-vfs-smb \
+      --with-x
+  make
 }
 
 package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-
-    make DESTDIR="${pkgdir}" install
-
-    # Fix FS#15177
-    sed 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \
-        -i "${pkgdir}/usr/lib/mc/extfs.d/uzip"
-
-    sed 's#/usr/bin/env python#/usr/bin/python2#' \
-        -i "${pkgdir}/usr/lib/mc/extfs.d/s3+"
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 }
-
-sha256sums=('c37ea495df93f6d375a3ce59cdcf0f3a3690338526205347b03a316daebdaaf8'
-            '2d05fa0bc5c6e5022a2d45a3cf1481c70da9f164c341d4204fa8506b6ce9f0d3')