summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Bidulock2013-07-07 22:48:04 -0600
committerBrian Bidulock2015-06-10 06:44:43 -0600
commit35899768853f9b472caf02305de48f0c9d2187e0 (patch)
tree9ea915d0a08b54150e7b337ef2be997243d8fd99
parent29aa96d8228f4912f9d0b045851de6b3c3eff532 (diff)
downloadaur-35899768853f9b472caf02305de48f0c9d2187e0.tar.gz
version 0.9.8.2-1
-rw-r--r--.SRCINFO56
-rw-r--r--PKGBUILD94
2 files changed, 54 insertions, 96 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 621f42e99081..e31221c38ec4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
pkgbase = networkmanager-ifupdown
pkgdesc = Network Management daemon
- pkgver = 0.9.8.10
- pkgrel = 5
+ pkgver = 0.9.8.2
+ pkgrel = 1
url = http://www.gnome.org/projects/NetworkManager/
+ install = networkmanager.install
arch = i686
arch = x86_64
- license = GPL2
- license = LGPL2.1
+ license = GPL
makedepends = intltool
makedepends = dhcpcd
makedepends = dhclient
@@ -14,50 +14,32 @@ pkgbase = networkmanager-ifupdown
makedepends = gobject-introspection
makedepends = gtk-doc
makedepends = git
- makedepends = ppp
- makedepends = modemmanager
- makedepends = dbus-glib
- makedepends = iproute2
- makedepends = libnl
- makedepends = nss
- makedepends = polkit
- makedepends = wpa_supplicant
- makedepends = dhcp-client
- makedepends = libsoup
- makedepends = systemd
- makedepends = libmm-glib
- source = http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.9/NetworkManager-0.9.8.10.tar.xz
- source = NetworkManager.conf
- source = disable_set_hostname.patch
- sha256sums = 064d27223d3824859df12e1fb25b787fec1c68bbc864dc52a0289b9211c4c972
- sha256sums = 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21
- sha256sums = 25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460
-
-pkgname = networkmanager-ifupdown
- install = networkmanager.install
- depends = libnm-glib-ifupdown
+ depends = dbus-glib
depends = iproute2
depends = libnl
+ depends = nss
depends = polkit
+ depends = udev
depends = wpa_supplicant
depends = dhcp-client
depends = libsoup
- depends = libmm-glib
+ depends = systemd
+ depends = modemmanager
optdepends = dhclient: DHCPv6 support
optdepends = dnsmasq: Connection sharing
- optdepends = bluez: Bluetooth support
+ optdepends = bluez4: Bluetooth support
optdepends = openresolv: resolvconf support
optdepends = ppp: Dialup connection support
- provides = networkmanager=0.9.8.10
+ provides = networkmanager=0.9.8.2
conflicts = networkmanager
+ options = !libtool
backup = etc/NetworkManager/NetworkManager.conf
+ source = http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.9/NetworkManager-0.9.8.2.tar.xz
+ source = NetworkManager.conf
+ source = disable_set_hostname.patch
+ sha256sums = 5c0b2f71b2f61e0dfbe95cebad83001758db252d5cdf5b6f7ceebac9c6bd7ead
+ sha256sums = 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21
+ sha256sums = 25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460
-pkgname = libnm-glib-ifupdown
- pkgdesc = NetworkManager library
- depends = libsystemd
- depends = nss
- depends = dbus-glib
- depends = libutil-linux
- provides = libnm-glib=0.9.8.10
- conflicts = libnm-glib
+pkgname = networkmanager-ifupdown
diff --git a/PKGBUILD b/PKGBUILD
index eef7f165d454..a30deaa2f9ce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,53 @@
-# $Id: PKGBUILD 211827 2014-04-27 16:57:26Z heftig $
-# Maintainer: Brian Bidulock <bidulock@openss7.org>
-# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinxu.org>
+# $Id: PKGBUILD 187894 2013-06-07 21:35:29Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Maintainer: Jan de Groot <jgc@archlinxu.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>
-pkgbase=networkmanager-ifupdown
-pkgname=(networkmanager-ifupdown libnm-glib-ifupdown)
-pkgver=0.9.8.10
-pkgrel=5
+pkgname=networkmanager-ifupdown
+_oldname=networkmanager
+_pkgname=NetworkManager
+pkgver=0.9.8.2
+pkgrel=1
pkgdesc="Network Management daemon"
-arch=(i686 x86_64)
-license=(GPL2 LGPL2.1)
-url="http://www.gnome.org/projects/NetworkManager/"
-makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc git ppp modemmanager
- dbus-glib iproute2 libnl nss polkit wpa_supplicant dhcp-client libsoup systemd
- libmm-glib)
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnome.org/projects/$_pkgname/"
+conflicts=($_oldname)
+provides=($_oldname=$pkgver)
+depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant dhcp-client
+ libsoup systemd modemmanager)
+makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc git)
+optdepends=('dhclient: DHCPv6 support'
+ 'dnsmasq: Connection sharing'
+ 'bluez4: Bluetooth support'
+ 'openresolv: resolvconf support'
+ 'ppp: Dialup connection support')
+options=('!libtool')
+backup=('etc/NetworkManager/NetworkManager.conf')
+install=networkmanager.install
#source=(git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=93c1041
-source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
+source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
NetworkManager.conf disable_set_hostname.patch)
-sha256sums=('064d27223d3824859df12e1fb25b787fec1c68bbc864dc52a0289b9211c4c972'
+sha256sums=('5c0b2f71b2f61e0dfbe95cebad83001758db252d5cdf5b6f7ceebac9c6bd7ead'
'44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
'25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
prepare() {
- cd NetworkManager-$pkgver
+ cd $_pkgname-$pkgver
patch -Np1 -i ../disable_set_hostname.patch
}
build() {
- cd NetworkManager-$pkgver
- ./configure --prefix=/usr \
+ cd $_pkgname-$pkgver
+ ./configure \
+ --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
- --sbindir=/usr/bin \
--libexecdir=/usr/lib/networkmanager \
+ --sbindir=/usr/bin \
--with-crypto=nss \
--with-dhclient=/usr/bin/dhclient \
--with-dhcpcd=/usr/bin/dhcpcd \
@@ -51,52 +62,17 @@ build() {
--disable-wimax \
--enable-modify-system \
--enable-doc \
- --enable-ifupdown \
- --with-pppd-plugin-dir=/usr/lib/pppd/2.4.6
+ --enable-ifupdown
- make V=0
+ make
}
-package_networkmanager-ifupdown() {
- depends=(libnm-glib-ifupdown iproute2 libnl polkit wpa_supplicant dhcp-client libsoup libmm-glib)
- optdepends=('dhclient: DHCPv6 support'
- 'dnsmasq: Connection sharing'
- 'bluez: Bluetooth support'
- 'openresolv: resolvconf support'
- 'ppp: Dialup connection support')
- provides=(networkmanager=$pkgver)
- conflicts=(networkmanager)
- install=networkmanager.install
- backup=('etc/NetworkManager/NetworkManager.conf')
-
- cd NetworkManager-$pkgver
+package() {
+ cd $_pkgname-$pkgver
make DESTDIR="$pkgdir" install
- make DESTDIR="$pkgdir" -C libnm-glib uninstall
- make DESTDIR="$pkgdir" -C libnm-util uninstall
- make DESTDIR="$pkgdir" -C vapi uninstall
-
- # 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"
rm -r "$pkgdir/var/run"
}
-
-package_libnm-glib-ifupdown() {
- pkgdesc="NetworkManager library"
- depends=(libsystemd nss dbus-glib libutil-linux)
- provides=(libnm-glib=$pkgver)
- conflicts=(libnm-glib)
-
- install -d "$pkgdir/usr/lib"
- mv include "$pkgdir/usr"
- mv pkgconfig "$pkgdir/usr/lib"
-
- cd NetworkManager-$pkgver
- make DESTDIR="$pkgdir" -C libnm-util install
- make DESTDIR="$pkgdir" -C libnm-glib install
- make DESTDIR="$pkgdir" -C vapi install
-}