[arch-commits] Commit in ristretto/repos (3 files)

[Jan de Groot]

    Date: Saturday, May 9, 2009 @ 15:14:06
  Author: jgc
Revision: 38649

Merged revisions 38521 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/ristretto/trunk

........
  r38521 | jgc | 2009-05-08 23:18:24 +0200 (Fri, 08 May 2009) | 2 lines
  
  upgpkg: ristretto 0.0.21-2
      Clean up dependencies, add desktop-file-utils and hicolor-icon-theme dependencies
........

Modified:
  ristretto/repos/extra-i686/	(properties)
  ristretto/repos/extra-i686/PKGBUILD
  ristretto/repos/extra-i686/ristretto.install

-------------------+
 PKGBUILD          |    7 +++----
 ristretto.install |    5 -----
 2 files changed, 3 insertions(+), 9 deletions(-)


Property changes on: ristretto/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /ristretto/trunk:1-19579
   + /ristretto/trunk:1-38648

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-05-09 19:11:36 UTC (rev 38648)
+++ extra-i686/PKGBUILD	2009-05-09 19:14:06 UTC (rev 38649)
@@ -3,13 +3,12 @@
 
 pkgname=ristretto
 pkgver=0.0.21
-pkgrel=1
+pkgrel=2
 pkgdesc="Ristretto is a image viewer for Xfce"
 arch=('i686' 'x86_64')
 url="http://goodies.xfce.org/projects/applications/ristretto"
 license=('GPL2')
-depends=('libjpeg' 'librsvg' 'libpng' \
-         'libxfcegui4' 'thunar')
+depends=('libxfcegui4' 'thunar' 'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('intltool' 'pkgconfig')
 options=('!libtool')
 groups=('xfce4-goodies')
@@ -19,7 +18,7 @@
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static || return 1
   make || return 1
   make DESTDIR=${pkgdir} install || return 1
 }

Modified: extra-i686/ristretto.install
===================================================================
--- extra-i686/ristretto.install	2009-05-09 19:11:36 UTC (rev 38648)
+++ extra-i686/ristretto.install	2009-05-09 19:14:06 UTC (rev 38649)
@@ -11,8 +11,3 @@
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
-
-op=$1
-shift
-
-$op $*