New version

2 files changed, 14 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 718db47c01eb..4a9662ee1ed6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = networkmanager-noscan
 	pkgdesc = Network Management daemon with Wi-Fi scanning disabled when already connected (improves reliability of the connection in several Wireless cards)
-	pkgver = 1.0.10
-	pkgrel = 4
+	pkgver = 1.0.12
+	pkgrel = 1
 	url = http://www.gnome.org/projects/NetworkManager/
-	install = networkmanager.install
 	arch = i686
 	arch = x86_64
 	license = GPL2
@@ -45,7 +44,7 @@ pkgbase = networkmanager-noscan
 	depends = libnewt
 	depends = libndp
 	depends = libteam
-	optdepends = dhclient: DHCPv6 support
+	depends = libgudev
 	optdepends = dnsmasq: connection sharing
 	optdepends = bluez: Bluetooth support
 	optdepends = openresolv: resolvconf support
@@ -56,11 +55,11 @@ pkgbase = networkmanager-noscan
 	conflicts = networkmanager
 	replaces = networkmanager
 	backup = etc/NetworkManager/NetworkManager.conf
-	source = http://ftp.gnome.org/pub/gnome/sources/NetworkManager/1.0/NetworkManager-1.0.10.tar.xz
+	source = http://ftp.gnome.org/pub/gnome/sources/NetworkManager/1.0/NetworkManager-1.0.12.tar.xz
 	source = NetworkManager.conf
 	source = disable_set_hostname.patch
 	source = disable_wifi_scan_when_connected.patch
-	sha256sums = 1bcfce8441dfd9f432a100d06b54f3831a2275cccc3b74b1b4c09a011e179fbc
+	sha256sums = 3a470f8c60109b1acb5784ddc2423501706b5fe34c793a6faee87e591eb04a9e
 	sha256sums = 2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b
 	sha256sums = 25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460
 	sha256sums = c14204de91e8b055982771aa11b57feee2fa42f04eee003e621252b320be1e31
diff --git a/PKGBUILD b/PKGBUILD
index 7c37cf17c569..750b86dfc971 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,24 +7,22 @@ provides=('networkmanager')
 replaces=('networkmanager')
 conflicts=('networkmanager')
 
-pkgver=1.0.10
-pkgrel=4
+pkgver=1.0.12
+pkgrel=1
 pkgdesc="Network Management daemon with Wi-Fi scanning disabled when already connected (improves reliability of the connection in several Wireless
 cards)"
 arch=(i686 x86_64)
 license=(GPL2 LGPL2.1)
 url="http://www.gnome.org/projects/NetworkManager/"
 _pppver=2.4.7
-depends=(libnm-glib iproute2 libnl polkit wpa_supplicant dhcp-client libsoup libmm-glib libnewt
-           libndp libteam)
-optdepends=('dhclient: DHCPv6 support'
-              'dnsmasq: connection sharing'
+depends=(libnm-glib iproute2 libnl polkit wpa_supplicant dhcp-client libsoup 
+         libmm-glib libnewt libndp libteam libgudev)
+optdepends=('dnsmasq: connection sharing'
               'bluez: Bluetooth support'
               'openresolv: resolvconf support'
               'ppp: dialup connection support'
               'rp-pppoe: ADSL support'
               'modemmanager: cellular network support')
-install=networkmanager.install
 backup=('etc/NetworkManager/NetworkManager.conf')
 makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc "ppp=$_pppver"
              modemmanager dbus-glib iproute2 libnl nss polkit wpa_supplicant dhcp-client libsoup
@@ -32,7 +30,7 @@ makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc "pp
 checkdepends=(libx11 python-gobject python-dbus)
 source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
         NetworkManager.conf disable_set_hostname.patch disable_wifi_scan_when_connected.patch)
-sha256sums=('1bcfce8441dfd9f432a100d06b54f3831a2275cccc3b74b1b4c09a011e179fbc'
+sha256sums=('3a470f8c60109b1acb5784ddc2423501706b5fe34c793a6faee87e591eb04a9e'
             '2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b'
             '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
             'c14204de91e8b055982771aa11b57feee2fa42f04eee003e621252b320be1e31')
@@ -82,8 +80,9 @@ package() {
   make DESTDIR="$pkgdir" -C libnm-util uninstall
   make DESTDIR="$pkgdir" -C vapi uninstall
 
-  rm -rf "$pkgdir/usr/include"
-  rm -rf "$pkgdir/usr/lib/pkgconfig"
+  # Some stuff to move is left over
+  mv "$pkgdir/usr/include" ..
+  mv "$pkgdir/usr/lib/pkgconfig" ..
 
   install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
   install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d"