[arch-commits] Commit in networkmanager/trunk (PKGBUILD)

[Jan Steffens]

    Date: Saturday, September 8, 2018 @ 12:16:31
  Author: heftig
Revision: 334128

1.14rc1-1

Modified:
  networkmanager/trunk/PKGBUILD	(contents, properties)

----------+
 PKGBUILD |   34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-08 10:30:53 UTC (rev 334127)
+++ PKGBUILD	2018-09-08 12:16:31 UTC (rev 334128)
@@ -1,4 +1,3 @@
-# $Id$
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 # Maintainer: Jan de Groot <jgc at archlinxu.org>
 # Contributor: Wael Nasreddine <gandalf at siemens-mobiles.org>
@@ -8,7 +7,7 @@
 
 pkgbase=networkmanager
 pkgname=(networkmanager libnm libnm-glib)
-pkgver=1.12.3dev+1+g0a3755c17
+pkgver=1.14rc1
 pkgrel=1
 pkgdesc="Network connection manager and user applications"
 url="https://wiki.gnome.org/Projects/NetworkManager"
@@ -18,10 +17,10 @@
 makedepends=(intltool dhclient iptables gobject-introspection gtk-doc "ppp=$_pppver" modemmanager
              dbus-glib iproute2 nss polkit wpa_supplicant curl systemd libmm-glib
              libnewt libndp libteam vala perl-yaml python-gobject git vala jansson bluez-libs
-             glib2-docs dhcpcd iwd dnsmasq systemd-resolvconf libpsl)
+             glib2-docs dhcpcd iwd dnsmasq systemd-resolvconf libpsl audit)
 checkdepends=(libx11 python-dbus)
-_commit=0a3755c1799d3a4dc1875d4c59c7c568a64c8456  # nm-1-12
-source=("git+https://anongit.freedesktop.org/git/NetworkManager/NetworkManager#commit=$_commit")
+_commit=16ad82f967cdef4a1bbea8d799c6a28fb1c2f09e  # tags/1.14-rc1^0
+source=("git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit")
 sha256sums=('SKIP')
 
 pkgver() {
@@ -30,13 +29,15 @@
 }
 
 prepare() {
+  mkdir build
   cd NetworkManager
   NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd NetworkManager
-  ./configure --prefix=/usr \
+  cd build
+  ../NetworkManager/configure \
+    --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
     runstatedir=/run \
@@ -77,6 +78,7 @@
     --with-iptables=/usr/bin/iptables \
     --with-iwd \
     --with-kernel-firmware-dir=/usr/lib/firmware \
+    --with-libaudit=yes \
     --with-libnm-glib \
     --with-libpsl \
     --with-modem-manager-1 \
@@ -95,20 +97,16 @@
     --with-wext \
     --without-consolekit \
     --without-dhcpcanon \
-    --without-libaudit \
     --without-more-asserts \
     --without-netconfig \
     --without-ofono \
     --without-selinux
-
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
   make
 }
 
 check() {
-  # netns tests fail in our containers
-  make -C NetworkManager -k check || :
+  make check -C build
 }
 
 _pick() {
@@ -122,17 +120,17 @@
 }
 
 package_networkmanager() {
-  depends=(libnm-glib iproute2 polkit wpa_supplicant libmm-glib libnewt libndp libteam curl
-           bluez-libs libpsl)
+  depends=(libnm libnm-glib iproute2 polkit wpa_supplicant libmm-glib libnewt libndp libteam curl
+           bluez-libs libpsl audit)
   optdepends=('dnsmasq: connection sharing'
               'bluez: Bluetooth support'
               'ppp: dialup connection support'
               'modemmanager: cellular network support'
               'iwd: wpa_supplicant alternative')
-  backup=('etc/NetworkManager/NetworkManager.conf')
-  groups=('gnome')
+  backup=(etc/NetworkManager/NetworkManager.conf)
+  groups=(gnome)
 
-  DESTDIR="$pkgdir" make -C NetworkManager install
+  DESTDIR="$pkgdir" make install -C build
 
   # packaged configuration
   install -Dm644 /dev/stdin "$pkgdir/usr/lib/NetworkManager/conf.d/20-connectivity.conf" <<END
@@ -178,3 +176,5 @@
   depends=(libnm dbus-glib)
   mv libnm-glib/* "$pkgdir"
 }
+
+# vim:set sw=2 et:


Property changes on: networkmanager/trunk/PKGBUILD
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property