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

[Eric Bélanger]

    Date: Friday, February 7, 2014 @ 22:28:47
  Author: eric
Revision: 105434

upgpkg: catfish 1.0.0-1

Upstream update, Add python2-pexpect depends, Fix optdepends, Add prepare function

Modified:
  catfish/trunk/PKGBUILD
  catfish/trunk/catfish.install

-----------------+
 PKGBUILD        |   24 ++++++++++++------------
 catfish.install |    2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-07 20:20:14 UTC (rev 105433)
+++ PKGBUILD	2014-02-07 21:28:47 UTC (rev 105434)
@@ -3,31 +3,34 @@
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=catfish
-pkgver=0.8.2
-pkgrel=2
+pkgver=1.0.0
+pkgrel=1
 pkgdesc='Versatile file searching tool'
 arch=('any')
 url='https://launchpad.net/catfish-search'
 license=('GPL')
 install=$pkgname.install 
-depends=('gtk3' 'python2-gobject' 'pyxdg' 'xdg-utils' 'hicolor-icon-theme')
+depends=('gtk3' 'python2-gobject' 'python2-xdg' 'xdg-utils' 'python2-pexpect')
 makedepends=('intltool')
 optdepends=('zeitgeist: Zeitgeist integration'
             'findutils: filename search'
-            'locate:    filename search'
+            'mlocate:    filename search'
             'tracker:   fulltext search'
             'strigi:    fulltext search'
             'pinot:     fulltext search')
 source=(https://launchpad.net/catfish-search/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.bz2)
-md5sums=('813666069e7b51d27722fcc6c5f36bf9')
+md5sums=('04459d78563f0e33f6f86114dbbd9fbd')
 
+prepare() {
+  cd $pkgname-$pkgver
+  sed -i '1s/python/python2/' {bin,catfish,catfish_lib}/*.py build.py
+  sed -i 's|ln -sf $(PREFIX)/share|ln -sf ..|' Makefile.in.in
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr \
     --python=python2
-
-  # Correct symlinks
-  sed -i 's|ln -sf $(DESTDIR)/$(PREFIX)/share|ln -sf ..|' Makefile
   make
 }
 
@@ -36,9 +39,6 @@
   make DESTDIR="$pkgdir" install
 
   install -d "$pkgdir"/usr/share/pixmaps
-  ln -s /usr/share/icons/hicolor/scalable/apps/$pkgname.svg \
+  ln -s ../icons/hicolor/scalable/apps/$pkgname.svg \
     "$pkgdir"/usr/share/pixmaps/$pkgname.svg
-
-  sed -i '1s/python/python2/' "$pkgdir"/usr/share/catfish/bin/catfish.py \
-    "$pkgdir"/usr/share/catfish/catfish_lib/pexpect/FSM.py
 }

Modified: catfish.install
===================================================================
--- catfish.install	2014-02-07 20:20:14 UTC (rev 105433)
+++ catfish.install	2014-02-07 21:28:47 UTC (rev 105434)
@@ -1,5 +1,5 @@
 post_install() {
-	[ -f /usr/bin/xdg-icon-resource ] && xdg-icon-resource forceupdate
+	xdg-icon-resource forceupdate
 }
 
 post_upgrade() {