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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 12:52:05
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/ghex

Modified: PKGBUILD (1.18 -> 1.19) ghex.install (1.7 -> 1.8)

upgpkg: ghex 2.8.2-4
Move to /usr


--------------+
 PKGBUILD     |   18 +++++++++---------
 ghex.install |   14 +++++++-------
 2 files changed, 16 insertions(+), 16 deletions(-)


Index: extra/gnome/ghex/PKGBUILD
diff -u extra/gnome/ghex/PKGBUILD:1.18 extra/gnome/ghex/PKGBUILD:1.19
--- extra/gnome/ghex/PKGBUILD:1.18	Fri Feb  9 05:49:53 2007
+++ extra/gnome/ghex/PKGBUILD	Sun Apr 22 12:52:05 2007
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD,v 1.18 2007/02/09 10:49:53 jgc Exp $
+# $Id: PKGBUILD,v 1.19 2007/04/22 16:52:05 jgc Exp $
 # Maintainer: tobias <tobias at archlinux.org>
 # Contributor: Tobias Kieslich <tobias at justdreams.de>
 
 pkgname=ghex
 pkgver=2.8.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A simple binary editor for the Gnome desktop"
 arch=(i686 x86_64)
+license=('GPL')
 url="http://www.gnu.org/directory/ghex.html"
-depends=('libgnomeui>=2.16.0' 'libgnomeprintui' 'gail>=1.10')
+depends=('libgnomeui>=2.18.1-2' 'libgnomeprintui>=2.18.0' 'gail>=1.18.0-2')
 makedepends=('perlxml' 'pkgconfig')
 options=('nolibtool')
 install=ghex.install
@@ -16,8 +17,6 @@
 md5sums=('1940a9f63b0d37604c6b489cda37fc19')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
-
   cd ${startdir}/src/${pkgname}-${pkgver}
   # disable scrollkeeper
   find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
@@ -25,11 +24,12 @@
     sed -i -e 's/-scrollkeeper-update.*//' omf.make
   fi
 
-  ./configure --prefix=/opt/gnome
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 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
+  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/ghex/ghex.install
diff -u extra/gnome/ghex/ghex.install:1.7 extra/gnome/ghex/ghex.install:1.8
--- extra/gnome/ghex/ghex.install:1.7	Fri Feb  9 05:49:54 2007
+++ extra/gnome/ghex/ghex.install	Sun Apr 22 12:52:05 2007
@@ -1,10 +1,9 @@
 pkgname=ghex
 
 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
+  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
 }
 
 pre_upgrade() {
@@ -16,18 +15,19 @@
 }
 
 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
   scrollkeeper-update -q -p var/lib/scrollkeeper
 }