Switch source to tarball

1 files changed, 15 insertions, 17 deletions

diff --git a/PKGBUILD b/PKGBUILD
index f32fa87..d89a783 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,11 +8,14 @@
 
 # # I maintain this because:
 # Arch version is not configured for openrc
+# Arch version uses git
 
+_altname=NetworkManager
 pkgbase=networkmanager
 pkgname=(networkmanager libnm nm-cloud-setup)
-pkgver=1.28.0
-pkgrel=1
+_basever=1.28
+pkgver=${_basever}.0
+pkgrel=1.2
 pkgdesc="Network connection manager and user applications"
 pkgdesc+=", modified for openrc"
 url="https://wiki.gnome.org/Projects/NetworkManager"
@@ -21,21 +24,11 @@ license=(GPL2 LGPL2.1)
 _pppver=2.4.7
 makedepends=(intltool dhclient iptables gobject-introspection gtk-doc "ppp=$_pppver" modemmanager
              iproute2 nss polkit wpa_supplicant curl libelogind libmm-glib
-             libnewt libndp libteam vala perl-yaml python-gobject git vala jansson bluez-libs
+             libnewt libndp libteam vala perl-yaml python-gobject vala jansson bluez-libs
              glib2-docs iwd dnsmasq openresolv libpsl audit meson)
 checkdepends=(libx11 python-dbus)
-_commit=6f32c5c10736d194322c760b108ce7d5de44d4a0  # tags/1.28.0^0
-source=("git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd NetworkManager
-  git describe | sed 's/-dev/dev/;s/-rc/rc/;s/-/+/g'
-}
-
-prepare() {
-  cd NetworkManager
-}
+source=(https://download.gnome.org/sources/${_altname}/${_basever}/${_altname}-${pkgver}.tar.xz)
+sha256sums=('3e170e9045e20598d2630e40c5789b2e2c46b942bfe5cb220f36202299253062')
 
 build() {
   local meson_args=(
@@ -65,6 +58,10 @@ build() {
     # configuration plugins
     -D config_plugins_default=keyfile
 
+    # handlers for resolv.conf
+    -D netconfig=no
+    -D config_dns_rc_manager_default=auto
+
     # dhcp clients
     -D dhcpcd=no
 
@@ -76,10 +73,11 @@ build() {
     -D qt=false
   )
 
-  arch-meson NetworkManager build "${meson_args[@]}"
+  arch-meson ${_altname}-${pkgver} build "${meson_args[@]}"
   meson compile -C build
 }
 
+# tests do not work in an offline build environment
 #check() {
 #  meson test -C build --print-errorlogs
 #}
@@ -121,7 +119,7 @@ END
   # packaged configuration
   install -Dm644 /dev/stdin "$pkgdir/usr/lib/NetworkManager/conf.d/20-connectivity.conf" <<END
 [connectivity]
-uri=http://www.archlinux.org/check_network_status.txt
+uri=http://archlinux.org/check_network_status.txt
 END
 
   shopt -s globstar