[arch-commits] Commit in quick-lounge-applet/trunk (PKGBUILD quick-lounge.install)

[Jan de Groot]

    Date: Monday, October 13, 2008 @ 07:43:56
  Author: jgc
Revision: 15370

upgpkg: quick-lounge-applet 2.12.5-1

Modified:
  quick-lounge-applet/trunk/PKGBUILD
  quick-lounge-applet/trunk/quick-lounge.install

----------------------+
 PKGBUILD             |   26 +++++++++++---------------
 quick-lounge.install |   21 ++-------------------
 2 files changed, 13 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-10-13 11:41:08 UTC (rev 15369)
+++ PKGBUILD	2008-10-13 11:43:56 UTC (rev 15370)
@@ -3,32 +3,28 @@
 # Contributor: Kritoke <typeolinux at yahoo.com>
 
 pkgname=quick-lounge-applet
-pkgver=2.12.4
+pkgver=2.12.5
 pkgrel=1
 pkgdesc="A GNOME2 applet that you can organize your preferred applications in a single place."
 arch=(i686 x86_64)
 license=('GPL')
-depends=('gnome-panel>=2.18.1' 'scrollkeeper')
-makedepends=('pkgconfig' 'gnome-doc-utils>=0.10.3')
+depends=('gnome-panel>=2.24.0')
+makedepends=('pkgconfig' 'gnome-doc-utils>=0.14')
 url="http://quick-lounge.sourceforge.net/"
+options=(!emptydirs)
 install=quick-lounge.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.12/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('20da41a503486459c32c91028495ca8c')
+md5sums=('b9ff8cd8a6eb4665e1e36b150c88e8cf')
 
 build() {
-  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
-
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
               --libexecdir=/usr/lib/quick-lounge-applet \
-              --localstatedir=/var --disable-scrollkeeper
+              --localstatedir=/var --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 || 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
-  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: quick-lounge.install
===================================================================
--- quick-lounge.install	2008-10-13 11:41:08 UTC (rev 15369)
+++ quick-lounge.install	2008-10-13 11:43:56 UTC (rev 15370)
@@ -1,10 +1,8 @@
 pkgname=quick-lounge-applet
 
 post_install() {
-  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
+  usr/sbin/gconfpkg --install ${pkgname}
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  scrollkeeper-update -q -p var/lib/scrollkeeper
 }
 
 pre_upgrade() {
@@ -16,24 +14,9 @@
 }
 
 pre_remove() {
-  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
+  usr/sbin/gconfpkg --uninstall ${pkgname}
 }
 
 post_remove() {
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  scrollkeeper-update -q -p var/lib/scrollkeeper
 }
-
-op=$1
-shift
-
-$op $*