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

[Jan Steffens]

    Date: Saturday, March 10, 2012 @ 15:00:56
  Author: heftig
Revision: 152954

3.3.1

Modified:
  gucharmap/trunk/PKGBUILD
  gucharmap/trunk/gucharmap.install

-------------------+
 PKGBUILD          |   21 +++++++++------------
 gucharmap.install |   14 ++++----------
 2 files changed, 13 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-10 19:50:51 UTC (rev 152953)
+++ PKGBUILD	2012-03-10 20:00:56 UTC (rev 152954)
@@ -1,33 +1,30 @@
 # $Id$
-# Maintainer: Jan De Groot <jgc at archlinux.org>
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan De Groot <jgc at archlinux.org>
 
 pkgname=gucharmap
-pkgver=3.2.2
+pkgver=3.3.1
 pkgrel=1
 pkgdesc="Gnome Unicode Charmap"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnome.org"
-depends=('gconf' 'hicolor-icon-theme')
+depends=('dconf' 'gtk3' 'hicolor-icon-theme')
 makedepends=('gtk-doc' 'intltool' 'gobject-introspection')
 options=('!libtool' '!emptydirs')
 install=gucharmap.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('da1e422d387ff4df8bfb61e8a340483f88b0d23e4309a776848dbeb4093a5a21')
+sha256sums=('ed70de66eb733349807c319240c78397c5f001f5419833208b8b0fbcf3b2d179')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
-      --disable-scrollkeeper  --enable-introspection
+      --disable-schemas-compile  --enable-introspection
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gucharmap $pkgdir/etc/gconf/schemas/*.schemas
-  rm -f $pkgdir/etc/gconf/schemas/*.schemas
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }

Modified: gucharmap.install
===================================================================
--- gucharmap.install	2012-03-10 19:50:51 UTC (rev 152953)
+++ gucharmap.install	2012-03-10 20:00:56 UTC (rev 152954)
@@ -1,22 +1,16 @@
-pkgname=gucharmap
-
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
+  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
+  (( $(vercmp $2 3.3) < 0 )) && gconfpkg --uninstall gucharmap
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }