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

[Jan de Groot]

    Date: Sunday, September 23, 2007 @ 15:56:54
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/ghex

Modified: PKGBUILD (1.19 -> 1.20) ghex.install (1.8 -> 1.9)

upgpkg: ghex 2.20.0-1
GNOME 2.20


--------------+
 PKGBUILD     |   20 +++++++-------------
 ghex.install |   18 ++++--------------
 2 files changed, 11 insertions(+), 27 deletions(-)


Index: extra/gnome/ghex/PKGBUILD
diff -u extra/gnome/ghex/PKGBUILD:1.19 extra/gnome/ghex/PKGBUILD:1.20
--- extra/gnome/ghex/PKGBUILD:1.19	Sun Apr 22 12:52:05 2007
+++ extra/gnome/ghex/PKGBUILD	Sun Sep 23 15:56:54 2007
@@ -1,29 +1,23 @@
-# $Id: PKGBUILD,v 1.19 2007/04/22 16:52:05 jgc Exp $
+# $Id: PKGBUILD,v 1.20 2007/09/23 19:56:54 jgc Exp $
 # Maintainer: tobias <tobias at archlinux.org>
 # Contributor: Tobias Kieslich <tobias at justdreams.de>
 
 pkgname=ghex
-pkgver=2.8.2
-pkgrel=4
+pkgver=2.20.0
+pkgrel=1
 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.18.1-2' 'libgnomeprintui>=2.18.0' 'gail>=1.18.0-2')
+depends=('libgnomeui>=2.20.0' 'libgnomeprintui>=2.18.1')
 makedepends=('perlxml' 'pkgconfig')
-options=('nolibtool')
+options=('!libtool' '!emptydirs')
 install=ghex.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/ghex/2.8/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('1940a9f63b0d37604c6b489cda37fc19')
+source=(http://ftp.gnome.org/pub/GNOME/sources/ghex/2.20/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('7f76315b08f0d54d58540bae2f014394')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  # disable scrollkeeper
-  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=/usr --sysconfdir=/etc \
               --localstatedir=/var
   make || return 1
Index: extra/gnome/ghex/ghex.install
diff -u extra/gnome/ghex/ghex.install:1.8 extra/gnome/ghex/ghex.install:1.9
--- extra/gnome/ghex/ghex.install:1.8	Sun Apr 22 12:52:05 2007
+++ extra/gnome/ghex/ghex.install	Sun Sep 23 15:56:54 2007
@@ -1,9 +1,8 @@
 pkgname=ghex
 
 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
-  scrollkeeper-update -q -p var/lib/scrollkeeper
+  usr/sbin/gconfpkg --install ${pkgname}
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 pre_upgrade() {
@@ -15,20 +14,11 @@
 }
 
 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() {
-  scrollkeeper-update -q -p var/lib/scrollkeeper
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 op=$1