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

[Jan Steffens]

    Date: Sunday, March 31, 2013 @ 12:41:48
  Author: heftig
Revision: 181083

3.8.0

Modified:
  devhelp/trunk/PKGBUILD
  devhelp/trunk/devhelp.install

-----------------+
 PKGBUILD        |   16 ++++++----------
 devhelp.install |   16 ++++++----------
 2 files changed, 12 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-31 10:30:28 UTC (rev 181082)
+++ PKGBUILD	2013-03-31 10:41:48 UTC (rev 181083)
@@ -4,18 +4,18 @@
 # Contributor: Link Dupont <link at subpop.net>
 
 pkgname=devhelp
-pkgver=3.6.1
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="API documentation browser for GNOME"
 arch=(i686 x86_64)
-license=('GPL')
+license=(GPL)
 url="http://live.gnome.org/devhelp/"
-depends=('gconf' 'webkitgtk3' 'hicolor-icon-theme')
-makedepends=('pkgconfig' 'intltool' 'python2')
+depends=(webkitgtk3 hicolor-icon-theme)
+makedepends=(pkgconfig intltool python)
 options=('!libtool' '!emptydirs')
 install=devhelp.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('71c6933422bf876745fc10276a2b2ee0f8c4c4ddfe034b3f6380507725fd4e63')
+sha256sums=('f8ebd829d96b975069bb70a1fc3b658c3e39505824c8ccb5abd23a6f75589dda')
 
 build() {
   cd $pkgname-$pkgver
@@ -27,9 +27,5 @@
 
 package() {
   cd $pkgname-$pkgver
-  make 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 devhelp ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+  make DESTDIR="${pkgdir}" install
 }

Modified: devhelp.install
===================================================================
--- devhelp.install	2013-03-31 10:30:28 UTC (rev 181082)
+++ devhelp.install	2013-03-31 10:41:48 UTC (rev 181083)
@@ -1,22 +1,18 @@
-pkgname=devhelp
-
 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
+  if (( $(vercmp $2 3.8.0) < 0 )); then
+    gconfpkg --uninstall devhelp
+  fi
 }
 
 post_upgrade() {
   post_install
 }
 
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }