diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-17 09:36:19 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-17 09:36:19 +0200 |
| commit | cb08e4a8bd52e55b2d425484b9fd2fe357f663c3 (patch) | |
| tree | 03aa7b8ad93cd8815a1c1be95b563a667d92d6b8 /extra/networkmanager | |
| parent | fb62b6371fdc9ffe50d30c698f13ea1fb39c215b (diff) | |
| parent | 61f450a3578b7e51c337e1a687c0cef2bc07ff35 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/lirc/PKGBUILD
extra/php/PKGBUILD
multilib/lib32-keyutils/PKGBUILD
multilib/lib32-util-linux/PKGBUILD
staging/clamav/PKGBUILD
testing/sysvinit/PKGBUILD
Diffstat (limited to 'extra/networkmanager')
| -rw-r--r-- | extra/networkmanager/PKGBUILD | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD index c22f2c85b..f391c88a2 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 161809 2012-06-14 18:56:19Z heftig $ +# $Id: PKGBUILD 161859 2012-06-15 19:32:00Z heftig $ # Maintainer: Jan de Groot <jgc@archlinxu.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> # Contributor: Tor Krill <tor@krill.nu> @@ -8,15 +8,14 @@ pkgname=networkmanager _pkgname=NetworkManager pkgver=0.9.4.0 -pkgrel=5 -_snapshot=83760a7 +pkgrel=6 pkgdesc="Network Management daemon" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.gnome.org/projects/$_pkgname/" depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wpa_supplicant' 'ppp' 'dhcpcd' 'libsoup') -makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection' 'gtk-doc') +makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection') optdepends=('modemmanager: for modem management service' 'dhclient: alternative DHCP/DHCPv6 client' 'iptables: Connection sharing' @@ -26,21 +25,25 @@ optdepends=('modemmanager: for modem management service' options=('!libtool') backup=('etc/NetworkManager/NetworkManager.conf') install=networkmanager.install -#source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz -source=(http://cgit.freedesktop.org/$_pkgname/$_pkgname/snapshot/$_pkgname-$_snapshot.tar.xz - NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch) -sha256sums=('6cb6d6c87306a7cd4aeed786c3445677b6df4e56ddcc4a6c1747c09c44114091' +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz + NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch + initialize-GError.patch dont-fight-over-ipv6.patch) +sha256sums=('eb4f124008b3d855a37205d03ef035b7218639cd7332bdae5567095977e93e0f' '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' - '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb') + '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb' + '95c06ad34c131b1db0f28d6e78003bd8fd0a3ba903f76027381e3c4c411c6cb6' + 'cc66f2fdf59f4f9873a5b775421e1968861c5541d7e29b83b4d30351ad1f9e94') build() { - cd $_pkgname-$_snapshot + cd $_pkgname-$pkgver patch -Np1 -i ../disable_set_hostname.patch patch -Np1 -i ../dnsmasq-path.patch + patch -Np1 -i ../initialize-GError.patch + patch -Np1 -i ../dont-fight-over-ipv6.patch - ./autogen.sh \ + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -62,10 +65,13 @@ build() { } package() { - cd $_pkgname-$_snapshot + cd $_pkgname-$pkgver make DESTDIR="$pkgdir" install install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/" rm -r "$pkgdir/var/run" + + # Provide native service for arch-daemons generator + ln -s NetworkManager.service "$pkgdir/usr/lib/systemd/system/networkmanager.service" } |