[arch-commits] Commit in network-manager-applet/trunk (2 files)

[Jan Steffens]

    Date: Tuesday, August 7, 2012 @ 13:56:28
  Author: heftig
Revision: 164969

0.9.6.0

Modified:
  network-manager-applet/trunk/PKGBUILD
  network-manager-applet/trunk/network-manager-applet.install

--------------------------------+
 PKGBUILD                       |   15 ++++++---------
 network-manager-applet.install |   18 +++++++++---------
 2 files changed, 15 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-08-07 17:47:49 UTC (rev 164968)
+++ PKGBUILD	2012-08-07 17:56:28 UTC (rev 164969)
@@ -6,20 +6,20 @@
 # Contributor: Will Rea <sillywilly at gmail.com>
 
 pkgname=network-manager-applet
-pkgver=0.9.4.1
+pkgver=0.9.6.0
 pkgrel=1
 pkgdesc="GNOME frontends to NetWorkmanager"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnome.org/projects/NetworkManager/"
 depends=('networkmanager' 'libgnome-keyring' 'polkit-gnome' 'gtk3' 'libnotify' 'gnome-icon-theme'
-         'mobile-broadband-provider-info' 'gconf' 'iso-codes')
+         'mobile-broadband-provider-info' 'iso-codes')
 makedepends=('intltool' 'gnome-bluetooth')
 optdepends=('gnome-bluetooth: for PAN/DUN support')
 options=('!libtool' '!emptydirs')
 install=network-manager-applet.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz)
-sha256sums=('b6b6de75e28d1fbcdfdbb51c0e40fcd6bc0ec0385bfecd16c457260491cd2ff7')
+sha256sums=('7bdcf9d28f2823d9514974977df618c83e79c581db57df718885735ba10144d5')
 
 build() {
   cd ${pkgname}-${pkgver}
@@ -27,15 +27,12 @@
       --localstatedir=/var \
       --libexecdir=/usr/lib/networkmanager \
       --disable-static \
-      --disable-maintainer-mode
+      --disable-maintainer-mode \
+      --disable-migration
   make
 }
 
 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 nm-applet ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+  make DESTDIR="${pkgdir}" install
 }

Modified: network-manager-applet.install
===================================================================
--- network-manager-applet.install	2012-08-07 17:47:49 UTC (rev 164968)
+++ network-manager-applet.install	2012-08-07 17:56:28 UTC (rev 164969)
@@ -1,18 +1,18 @@
-pkgname=network-manager-applet
-
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
+  glib-compile-schemas /usr/share/glib-2.0/schemas
   gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
 }
 
-post_upgrade() {
-  post_install $1
+pre_upgrade() {
+  if (( $(vercmp $2 0.9.6.0) < 0 )); then
+    gconfpkg --uninstall network-manager-applet
+  fi
 }
 
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
+post_upgrade() {
+  post_install
 }
 
 post_remove() {
-  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
+  post_install
+}