From 870527386e33c72826da94aee783bb212b06c53a Mon Sep 17 00:00:00 2001 From: root Date: Tue, 11 Sep 2012 00:03:28 +0000 Subject: Tue Sep 11 00:03:27 UTC 2012 --- extra/network-manager-applet/PKGBUILD | 19 ++++++++----------- .../network-manager-applet.install | 18 +++++++++--------- 2 files changed, 17 insertions(+), 20 deletions(-) (limited to 'extra/network-manager-applet') diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD index ee37765ba..9bd30be71 100644 --- a/extra/network-manager-applet/PKGBUILD +++ b/extra/network-manager-applet/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 156942 2012-04-23 09:09:34Z ibiru $ +# $Id: PKGBUILD 166523 2012-09-09 15:41:15Z heftig $ # Maintainer: Jan de Groot # Contributor: Arjan Timmerman # Contributor: Wael Nasreddine @@ -6,20 +6,20 @@ # Contributor: Will Rea pkgname=network-manager-applet -pkgver=0.9.4.1 +pkgver=0.9.6.2 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') +depends=("networkmanager>=${pkgver::5}" 'libgnome-keyring' 'polkit-gnome' 'gtk3' 'libnotify' + 'gnome-icon-theme' '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=('96c79ce199fe7770b66f2ddc5ee0a4b07a0ea1eaf5e2186b78d8dd69e38a3069') build() { cd ${pkgname}-${pkgver} @@ -27,15 +27,12 @@ build() { --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 } diff --git a/extra/network-manager-applet/network-manager-applet.install b/extra/network-manager-applet/network-manager-applet.install index 9922d12b2..255ea1f9a 100644 --- a/extra/network-manager-applet/network-manager-applet.install +++ b/extra/network-manager-applet/network-manager-applet.install @@ -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 +} -- cgit v1.2.3-54-g00ecf