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

[Maxime Gauduin]

    Date: Monday, September 9, 2019 @ 08:21:44
  Author: alucryd
Revision: 509083

upgpkg: lib32-libnm 1.20.2-1

Modified:
  lib32-libnm/trunk/PKGBUILD

----------+
 PKGBUILD |   62 ++++++++++++++++++-------------------------------------------
 1 file changed, 19 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-09 08:08:30 UTC (rev 509082)
+++ PKGBUILD	2019-09-09 08:21:44 UTC (rev 509083)
@@ -6,13 +6,10 @@
 # Contributor: Will Rea <sillywilly at gmail.com>
 # Contributor: Valentine Sinitsyn <e_val at inbox.ru>
 
-pkgbase=lib32-libnm
-pkgname=(
-  lib32-libnm
-  lib32-libnm-glib
-)
-pkgver=1.18.2
+pkgname=lib32-libnm
+pkgver=1.20.2
 pkgrel=1
+pkgdesc='NetworkManager client library'
 arch=(x86_64)
 url=https://wiki.gnome.org/Projects/NetworkManager
 license=(
@@ -19,6 +16,14 @@
   GPL2
   LGPL2.1
 )
+depends=(
+  lib32-glib2
+  lib32-glibc
+  lib32-nspr
+  lib32-nss
+  lib32-util-linux
+  libnm
+)
 makedepends=(
   dhclient
   git
@@ -37,10 +42,7 @@
   lib32-libnl
   lib32-libpsl
   lib32-libsoup
-  lib32-nspr
-  lib32-nss
   lib32-polkit
-  lib32-util-linux
   meson
   modemmanager
   perl-yaml
@@ -48,9 +50,15 @@
   systemd
   wpa_supplicant
 )
-source=(git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#tag=${pkgver})
+source=(git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#tag=957afc735b4908f15d55dca09490e36e48381f52)
 sha256sums=(SKIP)
 
+pkgver() {
+  cd NetworkManager
+
+  git describe --tags
+}
+
 prepare() {
   sed "s/'lib'/'lib32'/g" -i NetworkManager/meson.build
 }
@@ -87,17 +95,7 @@
   ninja -C build
 }
 
-package_lib32-libnm() {
-  pkgdesc='NetworkManager client library'
-  depends=(
-    lib32-glib2
-    lib32-glibc
-    lib32-nspr
-    lib32-nss
-    lib32-util-linux
-    libnm
-  )
-
+package() {
   install -dm 755 "${pkgdir}"/usr/lib32/pkgconfig
   cp -dr --no-preserve=ownership build/libnm/libnm.so* "${pkgdir}"/usr/lib32/
   cp -dr --no-preserve=ownership build/meson-private/libnm.pc "${pkgdir}"/usr/lib32/pkgconfig/
@@ -104,26 +102,4 @@
 
 }
 
-package_lib32-libnm-glib() {
-  pkgdesc='NetworkManager client library (legacy)'
-  depends=(
-    lib32-dbus
-    lib32-dbus-glib
-    lib32-glib2
-    lib32-glibc
-    lib32-libgudev
-    lib32-nspr
-    lib32-nss
-    lib32-util-linux
-    libnm-glib
-  )
-
-  install -dm 755 "${pkgdir}"/usr/lib32/pkgconfig
-  cp -dr --no-preserve=ownership build/libnm-glib/libnm*.so* "${pkgdir}"/usr/lib32/
-  cp -dr --no-preserve=ownership build/libnm-util/libnm*.so* "${pkgdir}"/usr/lib32/
-  cp -dr --no-preserve=ownership build/meson-private/libnm-glib*.pc "${pkgdir}"/usr/lib32/pkgconfig/
-  cp -dr --no-preserve=ownership build/meson-private/libnm-util.pc "${pkgdir}"/usr/lib32/pkgconfig/
-  cp -dr --no-preserve=ownership build/meson-private/NetworkManager.pc "${pkgdir}"/usr/lib32/pkgconfig/
-}
-
 # vim: ts=2 sw=2 et: