[arch-commits] Commit in file-roller/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Jan de Groot]

    Date: Sunday, November 30, 2008 @ 06:09:14
  Author: jgc
Revision: 19762

Merged revisions 19761 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/file-roller/trunk

........
  r19761 | jgc | 2008-11-30 11:09:03 +0000 (Sun, 30 Nov 2008) | 1 line
  
  upgpkg: file-roller 2.24.2-1
........

Modified:
  file-roller/repos/extra-x86_64/	(properties)
  file-roller/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)


Property changes on: file-roller/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /file-roller/trunk:1-17583
   + /file-roller/trunk:1-19761

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-30 11:09:03 UTC (rev 19761)
+++ extra-x86_64/PKGBUILD	2008-11-30 11:09:14 UTC (rev 19762)
@@ -2,30 +2,30 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=file-roller
-pkgver=2.24.1
+pkgver=2.24.2
 pkgrel=1
 pkgdesc="Archive manipulator for GNOME2"
 arch=(i686 x86_64)
 license=('GPL')
 depends=('libgnomeui>=2.24.0' 'desktop-file-utils') 
-makedepends=('perlxml' 'gnome-doc-utils>=0.14.0' 'pkgconfig' 'nautilus>=2.24.1')
+makedepends=('perlxml' 'gnome-doc-utils>=0.14.0' 'pkgconfig' 'nautilus>=2.24.2')
 groups=('gnome-extra')
 options=('!libtool' '!emptydirs')
 install=file-roller.install
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('da2ee9111041ade40013f75d8185f63d')
+md5sums=('886c5201e8609aadd69798aa745ada4a')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
               --libexecdir=/usr/lib/file-roller \
               --localstatedir=/var --disable-static \
 	      --disable-scrollkeeper || return 1
   make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
 
-  install -m755 -d ${startdir}/pkg/usr/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
-  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 || return 1
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }