[arch-commits] Commit in fish/trunk (PKGBUILD fish.install)

[Bartłomiej Piotrowski]

    Date: Sunday, March 9, 2014 @ 18:38:05
  Author: bpiotrowski
Revision: 106893

upgpkg: fish 2.1.0-2

add bc to dependencies and move python to optdeps (FS#39236)

Modified:
  fish/trunk/PKGBUILD
  fish/trunk/fish.install

--------------+
 PKGBUILD     |   18 +++++++-----------
 fish.install |    2 +-
 2 files changed, 8 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-09 17:27:31 UTC (rev 106892)
+++ PKGBUILD	2014-03-09 17:38:05 UTC (rev 106893)
@@ -1,6 +1,6 @@
 # $Id$
-# Maintainer: Kaiting Chen <kaitocracy at gmail.com>
-# Maintainer:  Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Kaiting Chen <kaitocracy at gmail.com>
 # Contributor: Abhishek Dasgupta <abhidg at gmail.com>
 # Contributor: Eric Belanger <eric at archlinux.org>
 # Contributor: Jan Fader <jan.fader at web.de>
@@ -7,19 +7,19 @@
 
 pkgname=fish
 pkgver=2.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Smart and user friendly shell intended mostly for interactive use'
 arch=('i686' 'x86_64')
 url='http://fishshell.com/'
 license=('GPL2')
-depends=('python2' 'inetutils')
-makedepends=('doxygen' 'python')
+depends=('bc' 'gcc-libs' 'inetutils' 'ncurses')
+optdepends=('python: for manual page completion parser and web configuration tool')
 install=fish.install
 source=(http://fishshell.com/files/$pkgver/fish-$pkgver.tar.gz)
 md5sums=('3a29aebde522b8f52d9975d7423db99e')
 
 build() {
-  cd fish-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --without-xsel
@@ -27,9 +27,5 @@
 }
 
 package() {
-  cd fish-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # use python2
-  find "$pkgdir"/usr/share/fish/tools/ -type f -exec sed -e "1s|python|python2|" -i {} \;
+  make -C $pkgname-$pkgver DESTDIR="$pkgdir" install
 }

Modified: fish.install
===================================================================
--- fish.install	2014-03-09 17:27:31 UTC (rev 106892)
+++ fish.install	2014-03-09 17:38:05 UTC (rev 106893)
@@ -1,5 +1,5 @@
 post_install() {
-	grep -q '/usr/bin/fish' etc/shells || echo '/usr/bin/fish' >> etc/shells
+  grep -q '/usr/bin/fish' etc/shells || echo '/usr/bin/fish' >> etc/shells
 }
 
 post_upgrade() {