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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 13:48:08
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/revelation

Modified: PKGBUILD (1.11 -> 1.12) revelation.install (1.6 -> 1.7)

upgpkg: revelation 0.4.11-3
Move


--------------------+
 PKGBUILD           |   22 +++++++++++-----------
 revelation.install |   16 +++++++++-------
 2 files changed, 20 insertions(+), 18 deletions(-)


Index: extra/gnome/revelation/PKGBUILD
diff -u extra/gnome/revelation/PKGBUILD:1.11 extra/gnome/revelation/PKGBUILD:1.12
--- extra/gnome/revelation/PKGBUILD:1.11	Mon Apr  2 18:34:38 2007
+++ extra/gnome/revelation/PKGBUILD	Sun Apr 22 13:48:08 2007
@@ -1,30 +1,30 @@
-# $Id: PKGBUILD,v 1.11 2007/04/02 22:34:38 jgc Exp $
+# $Id: PKGBUILD,v 1.12 2007/04/22 17:48:08 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=revelation
 pkgver=0.4.11
-pkgrel=2
+pkgrel=3
 pkgdesc="Password manager for the GNOME 2 desktop"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('gnome-python-desktop>=2.18.0' 'pycrypto>=2.0.1-2' 'gnome-panel>=2.18.0' 'cracklib')
+depends=('gnome-python-desktop>=2.18.0' 'pycrypto>=2.0.1-2' 'gnome-panel>=2.18.1' 'cracklib' 'desktop-file-utils')
 install=revelation.install
 url="http://oss.codepoet.no/revelation/"
 source=(ftp://oss.codepoet.no/revelation/revelation-${pkgver}.tar.bz2)
 md5sums=('e2db4a2f00f59b18798d4453c778129f')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
   cd ${startdir}/src/revelation-${pkgver}
 
   sed -i -e 's/gnome-python-extras/gnome-python-desktop/g' configure
-  ./configure --prefix=/opt/gnome \
-	--disable-mime-update --disable-desktop-update
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --libexecdir=/usr/lib/revelation \
+              --localstatedir=/var \
+	      --disable-mime-update --disable-desktop-update
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
-  mkdir -p ${startdir}/pkg/usr/share
-  mv ${startdir}/pkg/opt/gnome/share/icons ${startdir}/pkg/usr/share/icons
-  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
+
+  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/revelation/revelation.install
diff -u extra/gnome/revelation/revelation.install:1.6 extra/gnome/revelation/revelation.install:1.7
--- extra/gnome/revelation/revelation.install:1.6	Sun Dec 31 10:47:53 2006
+++ extra/gnome/revelation/revelation.install	Sun Apr 22 13:48:08 2007
@@ -1,10 +1,10 @@
 pkgname=revelation
 
 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
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
 }
 
 pre_upgrade() {
@@ -16,19 +16,21 @@
 }
 
 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
+  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
+  update-desktop-database -q
 }
 
 op=$1