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

[Jan Steffens]

    Date: Monday, March 21, 2011 @ 10:35:26
  Author: heftig
Revision: 115789

upgpkg: vinagre 2.91.91-2
Remove unnecessary gconf schema stuff

Modified:
  vinagre/trunk/PKGBUILD
  vinagre/trunk/vinagre.install

-----------------+
 PKGBUILD        |   10 +++-------
 vinagre.install |   18 ++++++------------
 2 files changed, 9 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2011-03-21 14:25:03 UTC (rev 115788)
+++ PKGBUILD    2011-03-21 14:35:26 UTC (rev 115789)
@@ -5,14 +5,14 @@
 
 pkgname=vinagre
 pkgver=2.91.91
-pkgrel=1
+pkgrel=2
 pkgdesc="A VNC Client for the GNOME Desktop"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnome.org/projects/vinagre/";
 install=vinagre.install
 depends=('libgnome-keyring' 'gtk-vnc' 'avahi' 'desktop-file-utils'
-         'hicolor-icon-theme' 'telepathy-glib' 'gconf' 'libpeas'
+         'hicolor-icon-theme' 'telepathy-glib' 'dconf' 'libpeas'
          'shared-mime-info')
 optdepends=('rdesktop: RDP plugin')
 makedepends=('gtk-doc' 'intltool' 'rdesktop')
@@ -31,9 +31,5 @@
 
 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 vinagre ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+  make DESTDIR="${pkgdir}" install
 }

Modified: vinagre.install
===================================================================
--- vinagre.install     2011-03-21 14:25:03 UTC (rev 115788)
+++ vinagre.install     2011-03-21 14:35:26 UTC (rev 115789)
@@ -1,26 +1,20 @@
-pkgname=vinagre
-
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
   update-mime-database usr/share/mime > /dev/null
 }
 
 pre_upgrade() {
-  pre_remove $1
+  if (( $(vercmp $2 2.91.91-2) < 0 )); then
+    usr/sbin/gconfpkg --uninstall vinagre
+  fi
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
 post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-mime-database usr/share/mime > /dev/null
+  post_install
 }