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

[Jan de Groot]

    Date: Saturday, November 8, 2008 @ 17:32:05
  Author: jgc
Revision: 18739

Merged revisions 356,18737 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/gthumb/trunk

........
  r356 | aaron | 2008-04-19 00:56:27 +0200 (Sat, 19 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r18737 | jgc | 2008-11-08 23:30:49 +0100 (Sat, 08 Nov 2008) | 1 line
  
  upgpkg: gthumb 2.10.10-1
........

Modified:
  gthumb/repos/extra-x86_64/	(properties)
  gthumb/repos/extra-x86_64/PKGBUILD
  gthumb/repos/extra-x86_64/gthumb.install

----------------+
 PKGBUILD       |   20 ++++++++++----------
 gthumb.install |    5 -----
 2 files changed, 10 insertions(+), 15 deletions(-)


Property changes on: gthumb/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /gthumb/trunk:1
   + /gthumb/trunk:1-18737

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-08 22:31:39 UTC (rev 18738)
+++ extra-x86_64/PKGBUILD	2008-11-08 22:32:05 UTC (rev 18739)
@@ -3,28 +3,28 @@
 # Contributor: Tobias Kieslich <tobias at justdreams.de>
  
 pkgname=gthumb
-pkgver=2.10.8
+pkgver=2.10.10
 pkgrel=1
 pkgdesc="Image browser and viewer for the GNOME Desktop"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://gthumb.sourceforge.net/"
-depends=('libgphoto2>=2.3.1' 'libgnomeui>=2.20.1.1' 'libxtst' 'libxxf86vm' 'desktop-file-utils')
-makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.0')
+depends=('libgphoto2>=2.4.3' 'libgnomeui>=2.24.0' 'libxtst' 'libxxf86vm' 'desktop-file-utils')
+makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.14.0')
 options=('!libtool' '!emptydirs')
 install=gthumb.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.10/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('104ca627037ccacf1aff18cc3923b40e')
+md5sums=('b3344b31f82830fdcf86865f4ecb7a95')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static \
-	      --disable-scrollkeeper
+	      --disable-scrollkeeper || return 1
   make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
 
-  mkdir -p ${startdir}/pkg/usr/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas
-  rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" ${pkgdir}/etc/gconf/schemas/*.schemas
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }

Modified: extra-x86_64/gthumb.install
===================================================================
--- extra-x86_64/gthumb.install	2008-11-08 22:31:39 UTC (rev 18738)
+++ extra-x86_64/gthumb.install	2008-11-08 22:32:05 UTC (rev 18739)
@@ -22,8 +22,3 @@
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
-
-op=$1
-shift
-
-$op $*