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

Jan de Groot jgc at archlinux.org
Mon Nov 9 09:16:57 EST 2009


    Date: Monday, November 9, 2009 @ 09:16:57
  Author: jgc
Revision: 58582

Manage gconf schemas (FS#17074)

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

--------------------------------+
 PKGBUILD                       |    9 +++++++--
 network-manager-applet.install |    7 +++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-11-09 13:28:19 UTC (rev 58581)
+++ PKGBUILD	2009-11-09 14:16:57 UTC (rev 58582)
@@ -7,7 +7,7 @@
 
 pkgname=network-manager-applet
 pkgver=0.7.1.998
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME frontends to NetWorkmanager"
 arch=(i686 x86_64)
 license=('GPL')
@@ -26,5 +26,10 @@
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var || return 1
   make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
+
+  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 || return 1
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+
 }

Modified: network-manager-applet.install
===================================================================
--- network-manager-applet.install	2009-11-09 13:28:19 UTC (rev 58581)
+++ network-manager-applet.install	2009-11-09 14:16:57 UTC (rev 58582)
@@ -1,4 +1,7 @@
+pkgname=network-manager-applet
+
 post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
   gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
 }
 
@@ -6,6 +9,10 @@
   post_install $1
 }
 
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}
+
 post_remove() {
   post_install $1
 }



More information about the arch-commits mailing list