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

[Jan de Groot]

    Date: Tuesday, March 17, 2009 @ 14:16:08
  Author: jgc
Revision: 30220

upgpkg: libgnome 2.26.0-1
    GNOME 2.26

Modified:
  libgnome/trunk/PKGBUILD
  libgnome/trunk/libgnome.install

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-17 18:12:07 UTC (rev 30219)
+++ PKGBUILD	2009-03-17 18:16:08 UTC (rev 30220)
@@ -2,27 +2,27 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=libgnome
-pkgver=2.24.1
+pkgver=2.26.0
 pkgrel=1
 pkgdesc="Common libraries for GNOME"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('gnome-vfs>=2.24.0' 'esd>=0.2.40' 'libbonobo>=2.24.0')
-makedepends=('pkgconfig' 'perlxml')
+depends=('gnome-vfs>=2.24.1' 'esound>=0.2.41' 'libbonobo>=2.24.1')
+makedepends=('pkgconfig' 'intltool')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=libgnome.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('3b2a30329898b37b2461b3aa886e5ad9')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('a5634fe9ddc54bbb726cbaaa35abc0b9')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static || 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
 
-  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 || 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
 }

Modified: libgnome.install
===================================================================
--- libgnome.install	2009-03-17 18:12:07 UTC (rev 30219)
+++ libgnome.install	2009-03-17 18:16:08 UTC (rev 30220)
@@ -15,8 +15,3 @@
 pre_remove() {
   usr/sbin/gconfpkg --install ${pkgname}
 }
-
-op=$1
-shift
-
-$op $*