From 684c0ea03d9d346756092fdcdd96e45dd082519d Mon Sep 17 00:00:00 2001 From: Cedric Girard Date: Mon, 25 Nov 2019 17:05:43 +0100 Subject: [PATCH] upgpkg: autojump-git 22.5.3.r0.g06e082c-2 import corrections from autojump PKGBUILD --- autojump-git/.SRCINFO | 2 +- autojump-git/PKGBUILD | 20 +++++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/autojump-git/.SRCINFO b/autojump-git/.SRCINFO index d4f0e09..1c24982 100644 --- a/autojump-git/.SRCINFO +++ b/autojump-git/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = autojump-git pkgdesc = A faster way to navigate your filesystem from the command line pkgver = 22.5.3.r0.g06e082c - pkgrel = 1 + pkgrel = 2 url = http://github.com/wting/autojump arch = any license = GPL3 diff --git a/autojump-git/PKGBUILD b/autojump-git/PKGBUILD index e75141e..ed795f6 100644 --- a/autojump-git/PKGBUILD +++ b/autojump-git/PKGBUILD @@ -5,7 +5,7 @@ pkgname=autojump-git pkgver=22.5.3.r0.g06e082c -pkgrel=1 +pkgrel=2 pkgdesc="A faster way to navigate your filesystem from the command line" arch=(any) url="http://github.com/wting/autojump" @@ -14,8 +14,6 @@ depends=('python') makedepends=('git') conflicts=('autojump') provides=('autojump') -replaces=() -backup=() source=('git+https://github.com/wting/autojump.git') md5sums=('SKIP') @@ -41,9 +39,21 @@ package() { "${pkgdir}"/etc/profile.d/$i done - #https://github.com/joelthelion/autojump/pull/339 + # FS#60929 + install -d "${pkgdir}/usr/lib/$_python/site-packages" + mv ${pkgdir}/usr/bin/*.py "${pkgdir}/usr/lib/$_python/site-packages" + python -m compileall -d /usr/lib "${pkgdir}/usr/lib" + python -O -m compileall -d /usr/lib "${pkgdir}/usr/lib" + + # FS#49601 + install -d "${pkgdir}"/usr/share/fish/completions + mv "${pkgdir}"/etc/profile.d/$_gitname.fish "${pkgdir}"/usr/share/fish/completions + + # https://github.com/joelthelion/autojump/pull/339 sed -i "s!/usr/local/!/usr/!g" "${pkgdir}"/etc/profile.d/$_gitname.sh - #FS#43762 + sed -i "s!/build/${pkgname}/pkg/${pkgname}/!/!g" "${pkgdir}"/etc/profile.d/$_gitname.sh + + # FS#43762 sed -i '27,31d' "${pkgdir}"/etc/profile.d/$_gitname.sh }