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

[Jan Steffens]

    Date: Saturday, April 18, 2015 @ 13:32:14
  Author: heftig
Revision: 237399

Split nm-applet instead of libnm-gtk

Added:
  network-manager-applet/trunk/nm-connection-editor.install
Modified:
  network-manager-applet/trunk/PKGBUILD
  network-manager-applet/trunk/network-manager-applet.install

--------------------------------+
 PKGBUILD                       |   45 ++++++++++++++++++++++++++++-----------
 network-manager-applet.install |    1 
 nm-connection-editor.install   |   12 ++++++++++
 3 files changed, 45 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-18 11:06:51 UTC (rev 237398)
+++ PKGBUILD	2015-04-18 11:32:14 UTC (rev 237399)
@@ -7,9 +7,9 @@
 # Contributor: Will Rea <sillywilly at gmail.com>
 
 pkgbase=network-manager-applet
-pkgname=(network-manager-applet libnm-gtk)
+pkgname=(nm-connection-editor network-manager-applet)
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Applet for managing network connections"
 arch=(i686 x86_64)
 license=(GPL2 LGPL2.1)
@@ -17,10 +17,12 @@
 makedepends=(libnm-glib libsecret gtk3 gnome-icon-theme mobile-broadband-provider-info iso-codes
              libnotify libmm-glib intltool gobject-introspection)
 options=('!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz)
 sha256sums=('5fede8d2060002c695fbba07e59cbc7db90a39a3378bb9690274c205d2503152')
 
 prepare() {
+  mkdir -p nma/etc/xdg nma/usr/bin \
+    nma/usr/share/{applications,icons/hicolor/22x22/apps,man/man1,nm-applet}
   cd $pkgbase-$pkgver
 }
 
@@ -45,19 +47,38 @@
   make -k check
 }
 
-package_network-manager-applet() {
-  depends=(libnm-gtk libmm-glib libnotify libsecret)
-  install=network-manager-applet.install
+package_nm-connection-editor() {
+  pkgdesc="NetworkManager GUI connection editor"
+  depends=(libnm-glib gtk3 mobile-broadband-provider-info iso-codes)
+  provides=("libnm-gtk=$pkgver-$pkgrel")
+  conflicts=(libnm-gtk)
+  replaces=(libnm-gtk)
+  install=nm-connection-editor.install
 
   cd $pkgbase-$pkgver
   make DESTDIR="$pkgdir" install
-  make DESTDIR="$pkgdir" -C src/libnm-gtk uninstall
+
+### Split network-manager-applet
+  cd ../nma
+  mv "$pkgdir"/etc/xdg/autostart etc/xdg/
+  mv "$pkgdir"/usr/bin/nm-applet usr/bin/
+  mv "$pkgdir"/usr/share/GConf usr/share/
+
+  cd usr/share
+  mv "$pkgdir"/usr/share/applications/nm-applet.desktop applications/
+  mv "$pkgdir"/usr/share/man/man1/nm-applet.1 man/man1/
+  mv "$pkgdir"/usr/share/nm-applet/{{8021x,gsm-unlock,info}.ui,keyring.png} nm-applet/
+  
+  cd icons/hicolor/22x22
+  mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{adhoc,mb-roam,wwan-tower}.png apps/
+  mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{secure,vpn-active}-lock.png apps/
+  mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{signal,tech}-*.png apps/
+  mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-*connecting*.png apps/
 }
 
-package_libnm-gtk() {
-  pkgdesc="NetworkManager GUI library"
-  depends=(libnm-glib gtk3 mobile-broadband-provider-info iso-codes)
+package_network-manager-applet() {
+  depends=(nm-connection-editor libmm-glib libnotify libsecret)
+  install=network-manager-applet.install
 
-  cd $pkgbase-$pkgver
-  make DESTDIR="$pkgdir" -C src/libnm-gtk install
+  mv nma/* "$pkgdir"
 }

Modified: network-manager-applet.install
===================================================================
--- network-manager-applet.install	2015-04-18 11:06:51 UTC (rev 237398)
+++ network-manager-applet.install	2015-04-18 11:32:14 UTC (rev 237399)
@@ -1,5 +1,4 @@
 post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
   gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
 }
 

Added: nm-connection-editor.install
===================================================================
--- nm-connection-editor.install	                        (rev 0)
+++ nm-connection-editor.install	2015-04-18 11:32:14 UTC (rev 237399)
@@ -0,0 +1,12 @@
+post_install() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}