[arch-commits] CVS update of extra/gnome/quick-lounge-applet (2 files)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 13:48:19
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/quick-lounge-applet

Modified: PKGBUILD (1.15 -> 1.16) quick-lounge.install (1.5 -> 1.6)

upgpkg: quick-lounge-applet 2.12.4-1
Move to /usr


----------------------+
 PKGBUILD             |   30 ++++++++++++++++++------------
 quick-lounge.install |   44 ++++++++++++++++----------------------------
 2 files changed, 34 insertions(+), 40 deletions(-)


Index: extra/gnome/quick-lounge-applet/PKGBUILD
diff -u extra/gnome/quick-lounge-applet/PKGBUILD:1.15 extra/gnome/quick-lounge-applet/PKGBUILD:1.16
--- extra/gnome/quick-lounge-applet/PKGBUILD:1.15	Fri May 26 05:00:19 2006
+++ extra/gnome/quick-lounge-applet/PKGBUILD	Sun Apr 22 13:48:19 2007
@@ -1,28 +1,34 @@
-# $Id: PKGBUILD,v 1.15 2006/05/26 09:00:19 andyrtr Exp $
-# Maintainer: arjan <arjan at archlinux.org>
+# $Id: PKGBUILD,v 1.16 2007/04/22 17:48:19 jgc Exp $
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Kritoke <typeolinux at yahoo.com>
 
 pkgname=quick-lounge-applet
-pkgver=2.12.1
-pkgrel=2
+pkgver=2.12.4
+pkgrel=1
 pkgdesc="A GNOME2 applet that you can organize your preferred applications in a single place."
 arch=(i686 x86_64)
-depends=('gnome-panel>=2.14')
+license=('GPL')
+depends=('gnome-panel>=2.18.1' 'scrollkeeper')
+makedepends=('pkgconfig' 'gnome-doc-utils>=0.10.3')
 url="http://quick-lounge.sourceforge.net/"
 install=quick-lounge.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/2.12/$pkgname-$pkgver.tar.bz2)
-md5sums=('7b1c9a3b38270539633034b179b9a11e')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.12/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('20da41a503486459c32c91028495ca8c')
 
 build() {
-  [ "$GNOMEDIR" = "" ] && source /etc/profile.d/gnome.sh
-
-  cd $startdir/src/$pkgname-$pkgver
+  cd ${startdir}/src/${pkgname}-${pkgver}
   find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
   if [ -f omf.make ]; then
     sed -i -e 's/-scrollkeeper-update.*//' omf.make
   fi
 
-  ./configure --prefix=/opt/gnome --disable-scrollkeeper
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --libexecdir=/usr/lib/quick-lounge-applet \
+              --localstatedir=/var --disable-scrollkeeper
   make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$startdir/pkg install
+  make 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/quick-lounge-applet/quick-lounge.install
diff -u extra/gnome/quick-lounge-applet/quick-lounge.install:1.5 extra/gnome/quick-lounge-applet/quick-lounge.install:1.6
--- extra/gnome/quick-lounge-applet/quick-lounge.install:1.5	Mon Sep 19 11:34:23 2005
+++ extra/gnome/quick-lounge-applet/quick-lounge.install	Sun Apr 22 13:48:19 2007
@@ -1,20 +1,10 @@
 pkgname=quick-lounge-applet
 
 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
-  update-desktop-database -q
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
+  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  scrollkeeper-update -q -p var/lib/scrollkeeper
 }
 
 pre_upgrade() {
@@ -26,23 +16,21 @@
 }
 
 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
+  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
+    schemas=(usr/share/gconf/schemas/${pkgname}.schemas)
+  elif [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
+    schemas=(opt/gnome/share/gconf/schemas/${pkgname}.schemas)
+  else
+    schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
+  fi
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
+  
+  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
 }
 
 post_remove() {
-  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  scrollkeeper-update -q -p var/lib/scrollkeeper
 }
 
 op=$1