Changed to new upstream, and small cleanup.

2 files changed, 20 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index de383abb458e..ed1cc067d476 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
 pkgbase = adhocspot-script-git
 	pkgdesc = Bash script to easily configure your interface to share your internet connection and configure a DHCP and DNS and TFTP boot server to listen on it. IP, DHCP, DNS can be configured, and for WiFi interfaces also wireless mode and encryption.
-	pkgver = 20190514.1
-	pkgrel = 3
+	pkgver = 20190514.3
+	pkgrel = 2
 	epoch = 0
-	url = http://git.dreieck.kettenbruch.de/dreieck/adhocspot-script
+	url = https://gitlab.com/dreieckli/adhocspot-script
 	install = adhocspot-script.install
 	arch = any
-	license = custom: Public Domain
+	license = GPL3
 	makedepends = git
 	depends = bash
 	depends = dnsmasq
@@ -14,14 +14,12 @@ pkgbase = adhocspot-script-git
 	depends = net-tools
 	depends = wireless_tools
 	depends = wpa_supplicant
-	provides = adhocspot-script=20190514.1
+	provides = adhocspot-script=20190514.3
 	conflicts = adhocspot-script
-	replaces = adhocspot-script<=20190514.1
 	options = emptydirs
-	source = adhocspot-script::git+http://git.dreieck.kettenbruch.de/dreieck/adhocspot-script.git
+	source = adhocspot-script::git+https://gitlab.com/dreieckli/adhocspot-script.git
 	source = adhocspot-script.install
 	sha256sums = SKIP
 	sha256sums = f05052583b9d7ba8215897bc621fea38d18fea20e1040fcbda4fd2ab76fc8867
 
 pkgname = adhocspot-script-git
-
diff --git a/PKGBUILD b/PKGBUILD
index bbb6482c811d..25b54bf7f01d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,12 @@
 _pkgname=adhocspot-script
 pkgname="${_pkgname}-git"
 epoch=0
-pkgver=20190514.1
-pkgrel=3
+pkgver=20190514.3
+pkgrel=2
 pkgdesc="Bash script to easily configure your interface to share your internet connection and configure a DHCP and DNS and TFTP boot server to listen on it. IP, DHCP, DNS can be configured, and for WiFi interfaces also wireless mode and encryption."
-url="http://git.dreieck.kettenbruch.de/dreieck/${_pkgname}"
+url="https://gitlab.com/dreieckli/adhocspot-script"
 arch=('any')
-license=('custom: Public Domain')
+license=('GPL3')
 groups=()
 depends=(
   "bash"
@@ -24,11 +24,11 @@ makedepends=(
 optdepends=()
 provides=("${_pkgname}=${pkgver}")
 conflicts=("${_pkgname}")
-replaces=("${_pkgname}<=${pkgver}")
+replaces=()
 options=('emptydirs')
 install='adhocspot-script.install'
 source=(
-  "${_pkgname}::git+http://git.dreieck.kettenbruch.de/dreieck/${_pkgname}.git"
+  "${_pkgname}::git+https://gitlab.com/dreieckli/adhocspot-script.git"
   "adhocspot-script.install"
 )
 sha256sums=(
@@ -36,14 +36,14 @@ sha256sums=(
   "f05052583b9d7ba8215897bc621fea38d18fea20e1040fcbda4fd2ab76fc8867"
 )
 
-pkgver() {
-  "${srcdir}/${_pkgname}/adhocspot.sh" --version
-}
-
 prepare() {
   chmod 755 "${srcdir}/${_pkgname}/adhocspot.sh" # So that pkgver() can execute it.
 }
 
+pkgver() {
+  "${srcdir}/${_pkgname}/adhocspot.sh" --version
+}
+
 package() {
   cd "${srcdir}/${_pkgname}"
 
@@ -53,11 +53,11 @@ package() {
   _docdir="${pkgdir}/${_docdirbase}"
   _execdirbase='/usr/bin'
   _execdir="${pkgdir}/${_execdirbase}"
-  _rundirbase="/run/adhocspot"
-  _rundir="${pkgdir}/${_rundirbase}"
+  # _rundirbase="/run/adhocspot"
+  # _rundir="${pkgdir}/${_rundirbase}"
 
   install -v -D -m755 "adhocspot.sh" "${_execdir}/adhocspot.sh"
   install -v -D -m644 "README.md" "${_docdir}/README.md"
-  install -v -D -m644 "copying.txt" "${_licdir}/copying.txt"
-  install -v -d -m755 "${_rundir}"
+  install -v -D -m644 "COPYING.GPL3.txt" "${_licdir}/COPYING.GPL3.txt"
+  # install -v -d -m755 "${_rundir}"
 }