Package name has been changed from fish-shell-git to fish-git.

This commit is contained in:
SanskritFritz
2015-09-21 00:54:05 +02:00
parent 643fe4fc8f
commit 814de1678c
2 changed files with 34 additions and 28 deletions

View File

@@ -1,24 +1,28 @@
pkgbase = fish-git pkgbase = fish-git
pkgdesc = User friendly shell intended mostly for interactive use (gitorius.org legacy version). pkgdesc = User friendly shell intended mostly for interactive use.
pkgver = 2012.01.31 pkgver = 2.2.0.r278.ge70ed96
pkgrel = 1 pkgrel = 1
epoch = 1 epoch = 2
url = http://gitorious.org/fish-shell url = http://fishshell.com
install = fish.install install = fish.install
arch = i686 arch = i686
arch = x86_64 arch = x86_64
arch = arm
license = GPL license = GPL
license = LGPL license = LGPL
license = BSD license = BSD
license = MIT license = MIT
makedepends = doxygen makedepends = doxygen
makedepends = git makedepends = git
depends = ncurses makedepends = ncurses
depends = bc depends = bc
optdepends = python2: make_completions script optdepends = python: fish_update_completions and other tools
optdepends = pkgfile: for command-not-found handler
provides = fish provides = fish
provides = fish-shell
conflicts = fish conflicts = fish
source = git://gitorious.org/fish-shell/fish-shell.git conflicts = fish-shell
source = git://github.com/fish-shell/fish-shell.git
md5sums = SKIP md5sums = SKIP
pkgname = fish-git pkgname = fish-git

View File

@@ -1,43 +1,45 @@
# Contributor: Abhishek Dasgupta <abhidg@gmail.com> # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
# Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: Jan Fader <jan.fader@web.de> # Contributor: Jan Fader <jan.fader@web.de>
# Contributor: SanskritFritz (gmail) # Contributor: Stephen Drodge <stephen.drodge@gmail.com>
# Maintainer: SanskritFritz (gmail)
pkgname=fish-git pkgname=fish-git
_gitname="fish-shell" _gitname="fish-shell"
pkgver=2012.01.31 pkgver=2.2.0.r278.ge70ed96
pkgrel=1 pkgrel=1
epoch=1 epoch=2
pkgdesc="User friendly shell intended mostly for interactive use (gitorius.org legacy version)." pkgdesc="User friendly shell intended mostly for interactive use."
arch=('i686' 'x86_64') arch=('i686' 'x86_64' 'arm')
url="http://gitorious.org/fish-shell" url="http://fishshell.com"
license=("GPL" "LGPL" "BSD" "MIT") license=("GPL" "LGPL" "BSD" "MIT")
depends=('ncurses' 'bc') depends=('bc')
optdepends=('python2: make_completions script') optdepends=('python: fish_update_completions and other tools'
makedepends=('doxygen' 'git') 'pkgfile: for command-not-found handler')
provides=('fish') makedepends=('doxygen' 'git' 'ncurses')
conflicts=('fish') provides=('fish' 'fish-shell')
install=fish.install conflicts=('fish' 'fish-shell')
source=("git://gitorious.org/fish-shell/fish-shell.git") install='fish.install'
source=("git://github.com/fish-shell/fish-shell.git")
md5sums=('SKIP') md5sums=('SKIP')
pkgver() { pkgver() {
cd "$_gitname" cd "$_gitname"
git log -1 --format="%cd" --date=short | sed 's|-|.|g' # git log -1 --format="%cd" --date=short | sed 's|-|.|g'
git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
} }
build() { build() {
cd $srcdir/$_gitname cd "$srcdir/$_gitname"
autoconf autoconf
./configure --prefix=/usr --sysconfdir=/etc --docdir=/usr/share/doc/fish --without-xsel ./configure --prefix=/usr --sysconfdir=/etc --docdir=/usr/share/doc/fish
make make
} }
package() { package() {
cd $srcdir/$_gitname cd "$srcdir/$_gitname"
make DESTDIR="$pkgdir" install make DESTDIR="$pkgdir" install
install -D -m644 user_doc/html/license.html "$pkgdir/usr/share/licenses/fish/license.html" # Workaround for file conflict:
rm "$pkgdir/usr/share/fish/completions/docker.fish"
install -m755 make_completions.py "$pkgdir/usr/bin/make_completions"
sed -i "s/python/python2/" "$pkgdir/usr/bin/make_completions"
} }