[arch-commits] CVS update of extra/gnome/gdesklets (PKGBUILD gdesklets.install)

[Roman Kyrylych]

    Date: Thursday, February 28, 2008 @ 06:35:15
  Author: roman
    Path: /home/cvs-extra/extra/gnome/gdesklets

Modified: PKGBUILD (1.27 -> 1.28) gdesklets.install (1.5 -> 1.6)

upgpkg: gdesklets 0.36.0-1


-------------------+
 PKGBUILD          |   37 ++++++++++++++++++++++---------------
 gdesklets.install |   35 ++---------------------------------
 2 files changed, 24 insertions(+), 48 deletions(-)


Index: extra/gnome/gdesklets/PKGBUILD
diff -u extra/gnome/gdesklets/PKGBUILD:1.27 extra/gnome/gdesklets/PKGBUILD:1.28
--- extra/gnome/gdesklets/PKGBUILD:1.27	Sun Apr 22 12:47:14 2007
+++ extra/gnome/gdesklets/PKGBUILD	Thu Feb 28 06:35:14 2008
@@ -1,25 +1,32 @@
-# $Id: PKGBUILD,v 1.27 2007/04/22 16:47:14 jgc Exp $
+# $Id: PKGBUILD,v 1.28 2008/02/28 11:35:14 roman Exp $
 # Committer: nifan <carlos at nifan.tk>
-# Mantainer: Jan de Groot <jgc at archlinux.org>
+# Mantainer: Roman Kyrylych <roman at archlinux.org>
 
 pkgname=gdesklets
-pkgver=0.35.4
-pkgrel=2
+pkgver=0.36.0
+pkgrel=1
 pkgdesc="gDesklets provides an advanced architecture for desktop applets."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
-url="http://gdesklets.org"
-options=('nolibtool')
-depends=('libgtop>=2.14.8-2' 'librsvg>=2.16.0' 'libgnomeui>=2.18.1-2' 'gnome-python>=2.18.0')
+url="http://gdesklets.de/"
+depends=('libgtop>=2.14.8-2' 'librsvg>=2.16.0' 'libgnomeui>=2.18.1-2'
+         'gnome-python>=2.18.0' 'gconf>=2.18.0.1-4' 'desktop-file-utils')
 makedepends=('perlxml' 'swig')
-source=(http://gdesklets.org/files/gDesklets-$pkgver.tar.bz2)
-md5sums=('61644df16206ce8797757ab306badd28')
+install=gdesklets.install
+source=(http://gdesklets.de/files/gdesklets-0.36.tar.bz2)
+md5sums=('766727f18f904968b622e7696fc9199b')
+options=('!libtool')
 
 build() {
-
-  cd $startdir/src/gDesklets-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var
+  cd $startdir/src/gdesklets-0.36
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make || return 1
-  make UPDATE_MIME_DATABASE=/bin/true UPDATE_DESKTOP_DATABASE=/bin/true DESTDIR=$startdir/pkg install
+
+  make UPDATE_MIME_DATABASE=/bin/true UPDATE_DESKTOP_DATABASE=/bin/true \
+    GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg 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
 }
Index: extra/gnome/gdesklets/gdesklets.install
diff -u extra/gnome/gdesklets/gdesklets.install:1.5 extra/gnome/gdesklets/gdesklets.install:1.6
--- extra/gnome/gdesklets/gdesklets.install:1.5	Mon Apr 25 04:57:23 2005
+++ extra/gnome/gdesklets/gdesklets.install	Thu Feb 28 06:35:14 2008
@@ -1,21 +1,8 @@
 pkgname=gdesklets
 
 post_install() {
-  schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
-  scrolls=(`pacman -Ql $pkgname | grep 'share/omf/.*\.omf$' | awk '{ print $2 }'`)
-
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-  for schema in "${schemas[@]}" ; do
-    opt/gnome/bin/gconftool-2 --makefile-install-rule "$schema" >/dev/null 2>&1
-  done
-
-  for scroll in "${scrolls[@]}" ; do
-    scrollkeeper-install -q -p var/lib/scrollkeeper "$scroll"
-  done
-
-  kill -s HUP `pidof /opt/gnome/bin/gconfd-2` > /dev/null 2>&1
+  usr/sbin/gconfpkg --install ${pkgname}
   update-desktop-database -q
-  update-mime-database opt/gnome/share/mime > /dev/null 2>&1
 }
 
 pre_upgrade() {
@@ -27,27 +14,9 @@
 }
 
 pre_remove() {
-  schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
-  scrolls=(`pacman -Ql $pkgname | grep 'share/omf/.*\.omf$' | awk '{ print $2 }'`)
-
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-  for schema in "${schemas[@]}" ; do
-    opt/gnome/bin/gconftool-2 --makefile-uninstall-rule "$schema" >/dev/null 2>&1
-  done
-
-  for scroll in "${scrolls[@]}" ; do
-    scrollkeeper-uninstall -q -p var/lib/scrollkeeper "$scroll"
-  done
-
-  kill -s HUP `pidof /opt/gnome/bin/gconfd-2` >/dev/null 2>&1
+  usr/sbin/gconfpkg --uninstall ${pkgname}
 }
 
 post_remove() {
   update-desktop-database -q
-  update-mime-database opt/gnome/share/mime > /dev/null 2>&1
 }
-
-op=$1
-shift
-
-$op $*