updating

3 files changed, 80 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 63e546a4ff3e..41e689b5a57b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,46 @@
+# Generated by mksrcinfo v8
+# Thu Dec  1 12:31:22 UTC 2016
 pkgbase = network-manager-applet-git
 	pkgdesc = Applet for managing network connections
-	pkgver = 1.1.0.r3454.g1cf5002
+	pkgver = 1.4.3.dev.r96.g8c44cbe
 	pkgrel = 1
 	url = http://www.gnome.org/projects/NetworkManager/
-	install = network-manager-applet-git.install
 	arch = i686
 	arch = x86_64
 	license = GPL2
 	license = LGPL2.1
+	makedepends = libsecret
+	makedepends = libnotify
+	makedepends = libmm-glib
 	makedepends = intltool
 	makedepends = gobject-introspection
-	depends = networkmanager-git
+	makedepends = git
+	depends = libnm-glib-git
+	depends = libgudev
 	depends = gtk3
-	depends = iso-codes
-	depends = libsecret
-	depends = notification-daemon
-	depends = libnotify
-	depends = adwaita-icon-theme
 	depends = mobile-broadband-provider-info
-	provides = network-manager-applet
-	provides = nm-connection-editor
-	provides = libnm-gtk
-	conflicts = nm-connection-editor
-	conflicts = network-manager-applet
+	depends = iso-codes
 	options = !libtool
+	options = emptydirs
 	source = git://git.gnome.org/network-manager-applet
 	sha256sums = SKIP
 	sha512sums = SKIP
 
+pkgname = nm-connection-editor-git
+	pkgdesc = NetworkManager GUI connection editor and widgets
+	provides = libnm-gtk=1.4.3.dev.r96.g8c44cbe-1
+	provides = nm-connection-editor
+	conflicts = libnm-gtk
+	conflicts = nm-connection-editor
+	replaces = libnm-gtk
+	replaces = nm-connection-editor
+
 pkgname = network-manager-applet-git
+	depends = nm-connection-editor
+	depends = libmm-glib
+	depends = libnotify
+	depends = libsecret
+	provides = network-manager-applet
+	conflicts = network-manager-applet
+	replaces = network-manager-applet
 
diff --git a/PKGBUILD b/PKGBUILD
index 0bc8f6df32ff..5f663812eba9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,42 +4,35 @@
 
 
 pkgbase=network-manager-applet-git
-pkgname=network-manager-applet-git
-pkgver=1.1.0.r3454.g1cf5002
+pkgname=(nm-connection-editor-git network-manager-applet-git)
+pkgver=1.4.3.dev.r96.g8c44cbe
 pkgrel=1
 pkgdesc="Applet for managing network connections"
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
 url="http://www.gnome.org/projects/NetworkManager/"
-depends=('networkmanager-git' 'gtk3' 'iso-codes' 'libsecret'
-         'notification-daemon' 'libnotify' 'adwaita-icon-theme'
-         'mobile-broadband-provider-info' )
-         
-makedepends=('intltool' 'gobject-introspection')
-provides=('network-manager-applet' 'nm-connection-editor' 'libnm-gtk')
-conflicts=('nm-connection-editor' 'network-manager-applet')
-options=('!libtool')
-install=${pkgbase}.install
+depends=(libnm-glib-git libgudev gtk3 mobile-broadband-provider-info iso-codes)
+makedepends=(libsecret libnotify libmm-glib intltool gobject-introspection git)
+options=('!libtool' 'emptydirs')
 source=(git://git.gnome.org/network-manager-applet)
 sha256sums=('SKIP')
 sha512sums=('SKIP')
 
 pkgver() {
-           cd $pkgbase/
-           local ver=$({ echo 'changequote([,])dnl';
-           sed -rn 's/^m4_(define.*nm_.*_version.*)/\1dnl/p' configure.ac;
-           echo '1.1.0'; 
-           echo 'define(AC_INIT,$2)dnl'
-           grep '^AC_INIT(.*)' configure.ac; } | m4)
-           local rev=$(git rev-list --count HEAD)
-           local git=$(git rev-parse --short HEAD)
-          echo "$ver.r$rev.g$git"
-                                                      }
+           cd $srcdir/network-manager-applet/
+           git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+       }
+prepare(){
+mkdir -p nma/etc/xdg nma/usr/bin \
+    nma/usr/share/{applications,icons/hicolor/22x22/apps,man/man1,nm-applet}
+  cd $srcdir/network-manager-applet
+  NOCONFIGURE=1 ./autogen.sh
 
+}
 build() {
-	cd network-manager-applet
+	cd $srcdir/network-manager-applet
 	
-	./autogen.sh --prefix=/usr --sysconfdir=/etc \
+	./configure --prefix=/usr --sysconfdir=/etc \
 		--localstatedir=/var \
 		--libexecdir=/usr/lib/networkmanager \
 		--disable-static \
@@ -52,9 +45,44 @@ build() {
   make
 }
 
-package() {
-  cd network-manager-applet
+check() {
+  cd $srcdir/network-manager-applet
+  make -k check
+}
+
+package_nm-connection-editor-git() {
+  pkgdesc="NetworkManager GUI connection editor and widgets"
+  provides=("libnm-gtk=$pkgver-$pkgrel" "nm-connection-editor")
+  conflicts=(libnm-gtk nm-connection-editor)
+  replaces=(libnm-gtk nm-connection-editor)
+
+  cd $srcdir/network-manager-applet
   make DESTDIR="$pkgdir" install
+
+### 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_network-manager-applet-git() {
+  provides=("network-manager-applet")
+  conflicts=(network-manager-applet)
+  replaces=(network-manager-applet)
+  depends=(nm-connection-editor libmm-glib libnotify libsecret)
+  mv nma/* "$pkgdir"
 }
 
 
diff --git a/network-manager-applet-git.install b/network-manager-applet-git.install
deleted file mode 100644
index 255ea1f9a1e5..000000000000
--- a/network-manager-applet-git.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 0.9.6.0) < 0 )); then
-    gconfpkg --uninstall network-manager-applet
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}