diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-16 12:30:02 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-16 12:30:02 +0200 |
| commit | fb62b6371fdc9ffe50d30c698f13ea1fb39c215b (patch) | |
| tree | b65df8847849e9c0e61f6dbec966948b102e14fa /extra/networkmanager | |
| parent | 17816ffb0849295b8a1ee5fecb008f3a26bf0545 (diff) | |
| parent | f186b4cb8562b60dd4e1f5331f248caf547c8839 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/perl-params-util/PKGBUILD
extra/xfce4-mixer/PKGBUILD
kde-unstable/libkcddb/PKGBUILD
staging/xine-lib/PKGBUILD
Diffstat (limited to 'extra/networkmanager')
| -rw-r--r-- | extra/networkmanager/PKGBUILD | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD index 06c30c3ab..c22f2c85b 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,6 +1,6 @@ -# $Id: PKGBUILD 157134 2012-04-24 18:49:00Z heftig $ +# $Id: PKGBUILD 161809 2012-06-14 18:56:19Z heftig $ # Maintainer: Jan de Groot <jgc@archlinxu.org> -# Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org> +# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> # Contributor: Tor Krill <tor@krill.nu> # Contributor: Will Rea <sillywilly@gmail.com> # Contributor: Valentine Sinitsyn <e_val@inbox.ru> @@ -8,14 +8,15 @@ pkgname=networkmanager _pkgname=NetworkManager pkgver=0.9.4.0 -pkgrel=4 +pkgrel=5 +_snapshot=83760a7 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') +makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection' 'gtk-doc') optdepends=('modemmanager: for modem management service' 'dhclient: alternative DHCP/DHCPv6 client' 'iptables: Connection sharing' @@ -25,26 +26,21 @@ optdepends=('modemmanager: for modem management service' options=('!libtool') backup=('etc/NetworkManager/NetworkManager.conf') install=networkmanager.install -#source=(http://cgit.freedesktop.org/$_pkgname/$_pkgname/snapshot/$_pkgname-master.tar.xz -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' +#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' '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' - '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb' - '95c06ad34c131b1db0f28d6e78003bd8fd0a3ba903f76027381e3c4c411c6cb6' - 'cc66f2fdf59f4f9873a5b775421e1968861c5541d7e29b83b4d30351ad1f9e94') + '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb') build() { - cd $_pkgname-$pkgver + cd $_pkgname-$_snapshot 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 - ./configure \ + ./autogen.sh \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -66,7 +62,7 @@ build() { } package() { - cd $_pkgname-$pkgver + cd $_pkgname-$_snapshot make DESTDIR="$pkgdir" install install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/" |