[arch-commits] Commit in ghex/trunk (PKGBUILD ghex.install)

[Ionut Biru]

    Date: Tuesday, August 16, 2011 @ 04:44:58
  Author: ibiru
Revision: 135589

update to 2.90.1

Modified:
  ghex/trunk/PKGBUILD
  ghex/trunk/ghex.install

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-16 07:52:57 UTC (rev 135588)
+++ PKGBUILD	2011-08-16 08:44:58 UTC (rev 135589)
@@ -3,31 +3,28 @@
 # Contributor: Tobias Kieslich <tobias at justdreams.de>
 
 pkgname=ghex
-pkgver=2.90.0
+pkgver=2.90.1
 pkgrel=1
 pkgdesc="A simple binary editor for the Gnome desktop"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://live.gnome.org/Ghex"
-depends=('gtk3' 'gconf' 'hicolor-icon-theme')
+depends=('gtk3' 'hicolor-icon-theme')
 makedepends=('intltool' 'gnome-doc-utils')
 options=('!libtool' '!emptydirs')
 install=ghex.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/ghex/2.90/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('2edeedcf1973c221d2f5ea1397099fbfc054b60cf2ebff5cb1ca9e83fd6c4974')
+sha256sums=('e736a322c3e25d0733bee72848f586c6477c11c0f0a63a77069be9048a66ec9a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
+      --localstatedir=/var --disable-static \
+      --disable-schemas-compile
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -d -m755 "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas --domain ghex-3.0 "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
+  make DESTDIR="${pkgdir}" install
 }

Modified: ghex.install
===================================================================
--- ghex.install	2011-08-16 07:52:57 UTC (rev 135588)
+++ ghex.install	2011-08-16 08:44:58 UTC (rev 135589)
@@ -1,22 +1,20 @@
 pkgname=ghex
 
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+    glib-compile-schemas usr/share/glib-2.0/schemas
+    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 pre_upgrade() {
-  pre_remove $1
+    if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then
+        gconfpkg --uninstall $pkgname
+    fi
 }
 
 post_upgrade() {
-  post_install $1
+    post_install $1
 }
 
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+    post_install $1
 }