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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 12:46:42
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/blam

Modified: PKGBUILD (1.11 -> 1.12) blam.install (1.4 -> 1.5)

upgpkg: blam 1.8.4-2
Move to /usr


--------------+
 PKGBUILD     |   16 +++++++---------
 blam.install |   17 +++++++----------
 2 files changed, 14 insertions(+), 19 deletions(-)


Index: extra/gnome/blam/PKGBUILD
diff -u extra/gnome/blam/PKGBUILD:1.11 extra/gnome/blam/PKGBUILD:1.12
--- extra/gnome/blam/PKGBUILD:1.11	Sat Mar 31 13:52:21 2007
+++ extra/gnome/blam/PKGBUILD	Sun Apr 22 12:46:42 2007
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD,v 1.11 2007/03/31 17:52:21 jgc Exp $
+# $Id: PKGBUILD,v 1.12 2007/04/22 16:46:42 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Link Dupont <link at subpop.net>
 
 pkgname=blam
 pkgver=1.8.4
-pkgrel=1
+pkgrel=2
 pkgdesc="BLAM! is a RSS reader and specially suited for reading planets around the world."
 arch=(i686 x86_64)
 license=('GPL')
@@ -17,22 +17,20 @@
 md5sums=('7ec48fece9994ed71dbb53ffa35b633e')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
   [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
 
   export MONO_SHARED_DIR=${startdir}/src/weird
   mkdir -p "${MONO_SHARED_DIR}"
 
   cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/opt/gnome --disable-static
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var --disable-static
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
        GACUTIL="/usr/bin/gacutil /root ${startdir}/pkg/usr/lib" \
        DESTDIR=$startdir/pkg install
 
-  mkdir -p ${startdir}/pkg/opt/gnome/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/opt/gnome/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/opt/gnome/etc/gconf/schemas/*.schemas
-  rm -f ${startdir}/pkg/opt/gnome/etc/gconf/schemas/*.schemas
-
-  rm -rf "${MONO_SHARED_DIR}"
+  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/blam/blam.install
diff -u extra/gnome/blam/blam.install:1.4 extra/gnome/blam/blam.install:1.5
--- extra/gnome/blam/blam.install:1.4	Sat Aug  5 09:46:02 2006
+++ extra/gnome/blam/blam.install	Sun Apr 22 12:46:42 2007
@@ -1,9 +1,8 @@
 pkgname=blam
 
 post_install() {
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-  opt/gnome/bin/gconftool-2 --makefile-install-rule opt/gnome/share/gconf/schemas/${pkgname}.schemas >/dev/null
-  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
 }
 
 pre_upgrade() {
@@ -15,18 +14,16 @@
 }
 
 pre_remove() {
-  if [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
+  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=`opt/gnome/bin/gconftool-2 --get-default-source`
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
   
-  opt/gnome/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
-}
-
-post_remove() {
-  update-desktop-database -q
+  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
 }
 
 op=$1