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

[Alexander Rødseth via arch-commits]

Date: Sunday, January 27, 2019 @ 15:47:02
  Author: arodseth
Revision: 428231

upgpkg: catfish 1.4.7-1

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

-+
 PKGBUILD|   26 +-
 catfish.install |2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-27 15:36:10 UTC (rev 428230)
+++ PKGBUILD2019-01-27 15:47:02 UTC (rev 428231)
@@ -4,29 +4,29 @@
 # Contributor: Pantelis Panayiotou 
 
 pkgname=catfish
-pkgver=1.4.6
-pkgrel=2
+pkgver=1.4.7
+pkgrel=1
 pkgdesc='Versatile file searching tool'
-arch=('any')
-url='https://launchpad.net/catfish-search'
-license=('GPL')
-install="$pkgname.install"
-depends=('gtk3' 'python-cairo' 'python-gobject' 'python-pexpect'
- 'python-ptyprocess' 'python-xdg' 'xdg-utils')
-makedepends=('git' 'intltool' 'python-distutils-extra')
+arch=(any)
+url='https://git.xfce.org/apps/catfish/about/'
+license=(GPL)
+install=$pkgname.install
+depends=(gtk3 python-cairo python-gobject python-pexpect
+ python-ptyprocess python-xdg xdg-utils)
+makedepends=(git intltool python-distutils-extra)
 optdepends=('mlocate: filename search'
 'zeitgeist: integration with zeitgeist')
-source=("git+https://git.launchpad.net/catfish-search#tag=catfish-$pkgver;)
+source=("git+https://git.xfce.org/apps/catfish/#tag=catfish-$pkgver;)
 md5sums=('SKIP')
 
 build() {
-  cd "$pkgname-search"
+  cd "$pkgname"
 
   python setup.py build
 }
 
 package () {
-  cd "$pkgname-search"
+  cd "$pkgname"
 
   python setup.py install --root="$pkgdir" --optimize=1
 
@@ -35,5 +35,5 @@
 "$pkgdir/usr/share/pixmaps/$pkgname.svg"
 }
 
-# getver: git.launchpad.net/catfish-search/plain/catfish.1
+# getver: git.xfce.org/apps/catfish/plain/catfish.1
 # vim: ts=2 sw=2 et:

Modified: catfish.install
===
--- catfish.install 2019-01-27 15:36:10 UTC (rev 428230)
+++ catfish.install 2019-01-27 15:47:02 UTC (rev 428231)
@@ -2,4 +2,4 @@
   echo 'One of the optional file search engines must be installed for catfish 
to work.'
 }
 
-# vim:set ts=2 sw=2 et:
+# vim: ts=2 sw=2 et:

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

[Alexander Rødseth]

Date: Saturday, April 30, 2016 @ 13:23:54
  Author: arodseth
Revision: 173119

upgpkg: catfish 1.4.2-1

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

-+
 PKGBUILD|6 +++---
 catfish.install |9 -
 2 files changed, 3 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-30 11:08:29 UTC (rev 173118)
+++ PKGBUILD2016-04-30 11:23:54 UTC (rev 173119)
@@ -5,8 +5,8 @@
 # Contributor: Pantelis Panayiotou 
 
 pkgname=catfish
-pkgver=1.4.1
-pkgrel=2
+pkgver=1.4.2
+pkgrel=1
 pkgdesc='Versatile file searching tool'
 arch=('any')
 url='https://launchpad.net/catfish-search'
@@ -21,7 +21,7 @@
 'strigi: fulltext search'
 'pinot: fulltext search')
 
source=("https://launchpad.net/catfish-search/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.bz2;)
-sha256sums=('6837b74f0dbafa005c84b37ec773c7128804327f759807c3ec42f04003ee8935')
+sha256sums=('a3fe087cdc7b2a2f2b6889d57893d1b7b678aacebde1a287fa4912ed7cf26b48')
 
 build() {
   cd "$pkgname-$pkgver"

Modified: catfish.install
===
--- catfish.install 2016-04-30 11:08:29 UTC (rev 173118)
+++ catfish.install 2016-04-30 11:23:54 UTC (rev 173119)
@@ -1,14 +1,5 @@
-post_upgrade() {
-  xdg-icon-resource forceupdate
-}
-
 post_install() {
-  post_upgrade
   echo 'One of the optional file search engines must be installed for catfish 
to work.'
 }
 
-post_remove() {
-  post_upgrade
-}
-
 # vim:set ts=2 sw=2 et:

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

[Alexander Rødseth]

Date: Saturday, March 12, 2016 @ 08:40:19
  Author: arodseth
Revision: 166202

upgpkg: catfish 1.4.1-2

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

-+
 PKGBUILD|2 +-
 catfish.install |   10 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-12 07:39:59 UTC (rev 166201)
+++ PKGBUILD2016-03-12 07:40:19 UTC (rev 166202)
@@ -6,7 +6,7 @@
 
 pkgname=catfish
 pkgver=1.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Versatile file searching tool'
 arch=('any')
 url='https://launchpad.net/catfish-search'

Modified: catfish.install
===
--- catfish.install 2016-03-12 07:39:59 UTC (rev 166201)
+++ catfish.install 2016-03-12 07:40:19 UTC (rev 166202)
@@ -1,14 +1,14 @@
-post_install() {
+post_upgrade() {
   xdg-icon-resource forceupdate
-  echo 'NOTE: One of the file search engines must be installed for catfish to 
work.'
 }
 
-post_upgrade() {
-  post_install
+post_install() {
+  post_upgrade
+  echo 'One of the optional file search engines must be installed for catfish 
to work.'
 }
 
 post_remove() {
-  post_install
+  post_upgrade
 }
 
 # vim:set ts=2 sw=2 et:

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

[Alexander Rødseth]

Date: Sunday, September 27, 2015 @ 23:48:40
  Author: arodseth
Revision: 141724

upgpkg: catfish 1.3.2-1

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

-+
 PKGBUILD|   11 ++-
 catfish.install |1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-27 21:12:52 UTC (rev 141723)
+++ PKGBUILD2015-09-27 21:48:40 UTC (rev 141724)
@@ -1,26 +1,27 @@
 # $Id$
-# Maintainer: Alexander Rødseth 
+# Maintainer: Alexander F Rødseth 
 # Contributor: Jaroslav Lichtblau 
 # Contributor: Alexander Fehr 
 # Contributor: Pantelis Panayiotou 
 
 pkgname=catfish
-pkgver=1.3.1
-pkgrel=2
+pkgver=1.3.2
+pkgrel=1
 pkgdesc='Versatile file searching tool'
 arch=('any')
 url='https://launchpad.net/catfish-search'
 license=('GPL')
 install="$pkgname.install"
-depends=('gtk3' 'mlocate' 'python-gobject' 'python-xdg' 'xdg-utils' 
'python-pexpect')
+depends=('gtk3' 'python-gobject' 'python-xdg' 'xdg-utils' 'python-pexpect')
 makedepends=('intltool')
 optdepends=('zeitgeist: integration with zeitgeist'
 'findutils: filename search'
+'mlocate: fulltext search'
 'tracker: fulltext search'
 'strigi: fulltext search'
 'pinot: fulltext search')
 
source=("https://launchpad.net/catfish-search/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.bz2;)
-sha256sums=('58d93cf56551d4cdb4fa3cbedcee32fa80d507d0d72638ecb947b176f0d81406')
+sha256sums=('be150ab9055add4390dbe22fee04b565633e507afd78a4dfbafaef9626f02255')
 
 prepare() {
   cd "$pkgname-$pkgver"

Modified: catfish.install
===
--- catfish.install 2015-09-27 21:12:52 UTC (rev 141723)
+++ catfish.install 2015-09-27 21:48:40 UTC (rev 141724)
@@ -1,5 +1,6 @@
 post_install() {
   xdg-icon-resource forceupdate
+  echo 'One of the file search engines must be installed for catfish to work.'
 }
 
 post_upgrade() {

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

[Alexander Rødseth]

Date: Monday, September 28, 2015 @ 00:07:13
  Author: arodseth
Revision: 141726

upgpkg: catfish 1.3.2-1

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

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

Modified: PKGBUILD
===
--- PKGBUILD2015-09-27 21:48:47 UTC (rev 141725)
+++ PKGBUILD2015-09-27 22:07:13 UTC (rev 141726)
@@ -16,7 +16,7 @@
 makedepends=('intltool')
 optdepends=('zeitgeist: integration with zeitgeist'
 'findutils: filename search'
-'mlocate: fulltext search'
+'mlocate: filename search'
 'tracker: fulltext search'
 'strigi: fulltext search'
 'pinot: fulltext search')

Modified: catfish.install
===
--- catfish.install 2015-09-27 21:48:47 UTC (rev 141725)
+++ catfish.install 2015-09-27 22:07:13 UTC (rev 141726)
@@ -1,6 +1,6 @@
 post_install() {
   xdg-icon-resource forceupdate
-  echo 'One of the file search engines must be installed for catfish to work.'
+  echo 'NOTE: One of the file search engines must be installed for catfish to 
work.'
 }
 
 post_upgrade() {

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

[Alexander Rødseth]

Date: Wednesday, October 22, 2014 @ 09:35:37
  Author: arodseth
Revision: 121204

upgpkg: catfish 1.2.2-2

Added:
  catfish/trunk/fixes.patch
Modified:
  catfish/trunk/PKGBUILD
  catfish/trunk/catfish.install

-+
 PKGBUILD|   14 +++
 catfish.install |8 --
 fixes.patch |   67 ++
 3 files changed, 81 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-10-22 07:33:53 UTC (rev 121203)
+++ PKGBUILD2014-10-22 07:35:37 UTC (rev 121204)
@@ -1,11 +1,12 @@
 # $Id$
 # Maintainer: Alexander Rødseth rods...@gmail.com
 # Contributor: Jaroslav Lichtblau dragonl...@aur.archlinux.org
-# Contributor: Alexander Fehr pizzapunk gmail com
+# Contributor: Alexander Fehr pizzap...@gmail.com
+# Contributor: Pantelis Panayiotou p.panayio...@gmail.com
 
 pkgname=catfish
 pkgver=1.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Versatile file searching tool'
 arch=('any')
 url='https://launchpad.net/catfish-search'
@@ -19,14 +20,17 @@
 'tracker: fulltext search'
 'strigi: fulltext search'
 'pinot: fulltext search')
-source=(https://launchpad.net/catfish-search/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.bz2;)
-sha256sums=('0e92844e761207b3d3086c45b26fccf83f0ebced741e1af33d8590779f25eedf')
+source=(https://launchpad.net/catfish-search/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.bz2;
+'fixes.patch')
+sha256sums=('0e92844e761207b3d3086c45b26fccf83f0ebced741e1af33d8590779f25eedf'
+'cc2f9bf1e964e1f41af19d1f0081189568229765df365fc1103c30aab5448b5f')
 
 prepare() {
   cd $pkgname-$pkgver
 
-  sed -i '1s/python/python2/' {bin,catfish,catfish_lib}/*.py build.py
+  sed -i '1s|python|python2|' {bin,catfish,catfish_lib}/*.py build.py
   sed -i 's|ln -sf $(PREFIX)/share|ln -sf ..|' Makefile.in.in
+  patch -p1 -i $srcdir/fixes.patch
 }
 
 build() {

Modified: catfish.install
===
--- catfish.install 2014-10-22 07:33:53 UTC (rev 121203)
+++ catfish.install 2014-10-22 07:35:37 UTC (rev 121204)
@@ -1,11 +1,13 @@
 post_install() {
-   xdg-icon-resource forceupdate
+  xdg-icon-resource forceupdate
 }
 
 post_upgrade() {
-   post_install
+  post_install
 }
 
 post_remove() {
-   post_install
+  post_install
 }
+
+# vim:set ts=2 sw=2 et:

Added: fixes.patch
===
--- fixes.patch (rev 0)
+++ fixes.patch 2014-10-22 07:35:37 UTC (rev 121204)
@@ -0,0 +1,67 @@
+diff -aur catfish-1.2.2/catfish/CatfishWindow.py 
catfish-1.2.2.new/catfish/CatfishWindow.py
+--- catfish-1.2.2/catfish/CatfishWindow.py 2014-10-12 13:55:12.152362617 
+0300
 catfish-1.2.2.new/catfish/CatfishWindow.py 2014-10-12 13:56:16.05061 
+0300
+@@ -34,7 +34,7 @@
+ import logging
+ logger = logging.getLogger('catfish')
+ 
+-from catfish_lib import Window, CatfishSettings, SudoDialog, helpers
++from catfish_lib import catfishconfig, Window, CatfishSettings, SudoDialog, 
helpers
+ from catfish.AboutCatfishDialog import AboutCatfishDialog
+ from catfish.CatfishSearchEngine import *
+ 
+@@ -226,7 +226,9 @@
+ locate, locate_path, locate_date = self.check_locate()
+ 
+ self.update_index_database.set_label(tt%s/tt % locate_path)
+-if os.path.isfile(locate_path):
++if not os.access(os.path.dirname(locate_path), os.R_OK):
++modified = _(Unknown)
++elif os.path.isfile(locate_path):
+ modified = locate_date.strftime(%x %X)
+ else:
+ modified = _(Never)
+@@ -452,8 +454,10 @@
+ return None
+ path = os.path.realpath(path)
+ locate = os.path.basename(path)
+-db = os.path.join('/var/lib', locate, locate + '.db')
+-if os.path.isfile(db):
++db = catfishconfig.get_locate_db_path()
++if not os.access(os.path.dirname(db), os.R_OK):
++modified = time.time()
++elif os.path.isfile(db):
+ modified = os.path.getmtime(db)
+ else:
+ modified = 0
+diff -aur catfish-1.2.2/catfish_lib/catfishconfig.py 
catfish-1.2.2.new/catfish_lib/catfishconfig.py
+--- catfish-1.2.2/catfish_lib/catfishconfig.py 2014-10-12 13:55:12.155696032 
+0300
 catfish-1.2.2.new/catfish_lib/catfishconfig.py 2014-10-12 
13:56:36.334431598 +0300
+@@ -20,11 +20,14 @@
+ 'project_path_not_found',
+ 'get_data_file',
+ 'get_data_path',
++'get_locate_db_path',
+ ]
+ 
+ # Where your project will look for your data (for instance, images and ui
+ # files). By default, this is ../data, relative your trunk layout
+ __catfish_data_directory__ = '../data/'
++# Location of locate.db file
++__locate_db_path__ = '/var/lib/mlocate/mlocate.db'
+ __license__ = 'GPL-2'
+ __version__ = '1.2.2'
+ 
+@@ 

[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
===
--- PKGBUILD2014-02-07 20:20:14 UTC (rev 105433)
+++ PKGBUILD2014-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() {