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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 12:51:39
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/ggv

Modified: PKGBUILD (1.20 -> 1.21) ggv.install (1.6 -> 1.7)

upgpkg: ggv 2.12.0-2
Move to /usr


-------------+
 PKGBUILD    |   23 ++++++++++++++---------
 ggv.install |   40 ++++++++++++++--------------------------
 2 files changed, 28 insertions(+), 35 deletions(-)


Index: extra/gnome/ggv/PKGBUILD
diff -u extra/gnome/ggv/PKGBUILD:1.20 extra/gnome/ggv/PKGBUILD:1.21
--- extra/gnome/ggv/PKGBUILD:1.20	Thu May 25 17:00:17 2006
+++ extra/gnome/ggv/PKGBUILD	Sun Apr 22 12:51:39 2007
@@ -1,28 +1,33 @@
-# $Id: PKGBUILD,v 1.20 2006/05/25 21:00:17 andyrtr Exp $
-# Maintainer: arjan <arjan at archlinux.org>
+# $Id: PKGBUILD,v 1.21 2007/04/22 16:51:39 jgc Exp $
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=ggv
 pkgver=2.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Postscript viewer"
 arch=(i686 x86_64)
-depends=('libgnomeui' 'ghostscript')
-makedepends=('intltool')
+license=('GPL')
+depends=('libgnomeui>=2.18.1-2' 'ghostscript' 'scrollkeeper' 'desktop-file-utils')
+makedepends=('perlxml' 'pkgconfig')
 url="http://www.gnome.org"
 install=ggv.install
 source=(http://ftp.gnome.org/pub/gnome/sources/ggv/2.12/ggv-${pkgver}.tar.bz2)
 md5sums=('418f0ef3f8b82bb0c423a2a1cf6769f7')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
-
   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
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --libexecdir=/usr/lib/ggv \
+              --localstatedir=/var
   make || return 1
   make GCONF_DISABLE_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/ggv/ggv.install
diff -u extra/gnome/ggv/ggv.install:1.6 extra/gnome/ggv/ggv.install:1.7
--- extra/gnome/ggv/ggv.install:1.6	Thu Nov 17 08:08:44 2005
+++ extra/gnome/ggv/ggv.install	Sun Apr 22 12:51:39 2007
@@ -1,19 +1,9 @@
 pkgname=ggv
 
 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
+  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
+  scrollkeeper-update -q -p var/lib/scrollkeeper
   update-desktop-database -q
 }
 
@@ -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
+  scrollkeeper-update -q -p var/lib/scrollkeeper
 }
 
 op=$1