diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-15 11:36:24 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-15 11:36:24 -0300 |
| commit | 7caeeae33fd491dbea5044168bbc50197963118c (patch) | |
| tree | 2ceec96ef9e1897d921d05f2fc5c5dda2ad893e9 /extra/networkmanager | |
| parent | 2f39e56def6dadf0746b6e96e756518f1af9396b (diff) | |
| parent | 3d151dfc8e08b65c2c1d4b5e8081562d56ee7d41 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ginac/PKGBUILD
community/gnash/PKGBUILD
community/haskell-tar/PKGBUILD
community/libdlna/PKGBUILD
community/mplayer2/PKGBUILD
community/musescore/PKGBUILD
community/open-vm-tools-modules/PKGBUILD
community/paraview/PKGBUILD
community/picard/PKGBUILD
core/idnkit/PKGBUILD
core/ifenslave/PKGBUILD
extra/audacious/PKGBUILD
extra/avidemux/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/graphite/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/k3b/PKGBUILD
extra/kdemultimedia/PKGBUILD
extra/koffice/PKGBUILD
extra/kradio/PKGBUILD
extra/libreoffice/PKGBUILD
extra/mediastreamer/PKGBUILD
extra/poppler/PKGBUILD
extra/vlc/PKGBUILD
libre/texlive-bin-libre/PKGBUILD
Diffstat (limited to 'extra/networkmanager')
| -rw-r--r-- | extra/networkmanager/PKGBUILD | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD index 595d0f4c9..cc0193e0b 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141464 2011-10-30 15:23:34Z ibiru $ +# $Id: PKGBUILD 142491 2011-11-10 19:42:04Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinxu.org> # Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org> # Contributor: Tor Krill <tor@krill.nu> @@ -6,7 +6,7 @@ # Contributor: Valentine Sinitsyn <e_val@inbox.ru> pkgname=networkmanager -pkgver=0.9.1.95 +pkgver=0.9.2.0 pkgrel=1 pkgdesc="Network Management daemon" arch=('i686' 'x86_64' 'mips64el') @@ -18,13 +18,14 @@ optdepends=('modemmanager: for modem management service' 'dhclient: alternative DHCP/DHCPv6 client' 'iptables: Connection sharing' 'dnsmasq: Connection sharing' - 'bluez: Bluetooth support') + 'bluez: Bluetooth support' + 'openresolv: openresolv support') options=('!libtool') backup=('etc/NetworkManager/NetworkManager.conf') install=networkmanager.install source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.9/NetworkManager-${pkgver}.tar.xz NetworkManager.conf disable_set_hostname.patch) -sha256sums=('4702c25324fc6c0e860a9be9860b898ce444333d084b0d5b86b069bbd5fee468' +sha256sums=('437af9132a6fe1ff603cd981c0cfaa4557592b34782f9705e708d61365226ddf' '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460') @@ -44,6 +45,7 @@ build() { --with-dhcpcd=/sbin/dhcpcd \ --with-iptables=/usr/sbin/iptables \ --with-systemdsystemunitdir=/lib/systemd/system \ + --with-resolvconf=/usr/sbin/resolvconf \ --disable-static \ --enable-more-warnings=no \ --disable-wimax |