v0.7.8

2 files changed, 9 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 16998916b119..e79770388482 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
-pkgbase = zeronet-conservancy-git
+pkgbase = zeronet-conservancy
 	pkgdesc = modern client for decentralized p2p web platform 0net
-	pkgver = 0.7.7+.r5035.g3c93ca6a
+	pkgver = 0.7.8
 	pkgrel = 1
 	url = https://github.com/zeronet-conservancy/zeronet-conservancy/
 	install = zeronet.install
 	arch = any
-	license = GPL2
+	license = GPL3
 	checkdepends = python-pytest
 	checkdepends = python-mock
 	makedepends = git
@@ -31,11 +31,11 @@ pkgbase = zeronet-conservancy-git
 	conflicts = zeronet
 	options = !strip
 	backup = etc/zeronet.conf
-	source = git+https://github.com/zeronet-conservancy/zeronet-conservancy.git#branch=master
+	source = git+https://github.com/zeronet-conservancy/zeronet-conservancy.git#tag=v0.7.8
 	source = zeronet.conf
 	source = zeronet.service
 	sha256sums = SKIP
 	sha256sums = ea735e82dbb10a2c1fda7abfeb2f38c2429044d8254f9e2396c50cecb6f778f8
 	sha256sums = 2ee64a1b671a49a1626901a11d4d7fa338c77cb9b7c9facd2f56b087a4a0bb83
 
-pkgname = zeronet-conservancy-git
+pkgname = zeronet-conservancy
diff --git a/PKGBUILD b/PKGBUILD
index ddc8b306f34c..94c2793cdcb9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,10 +2,10 @@
 # Contributor: redfish <redfish at galactica dot pw>
 # Contributor: Lothar_m <lothar_m at riseup dot net>
 
-pkgname='zeronet-conservancy-git'
+pkgname='zeronet-conservancy'
 _gitname='zeronet-conservancy'
 _gitroot='https://github.com/zeronet-conservancy/zeronet-conservancy.git'
-pkgver=0.7.7+.r5035.g3c93ca6a
+pkgver=0.7.8
 pkgrel=1
 arch=('any')
 url='https://github.com/zeronet-conservancy/zeronet-conservancy/'
@@ -23,24 +23,17 @@ optdepends=('tor: anonymity'
 	    'namecoin-core: local name resolution')
 makedepends=('git')
 checkdepends=('python-pytest' 'python-mock')
-license=('GPL2')
+license=('GPL3')
 pkgdesc="modern client for decentralized p2p web platform 0net"
 provides=(zeronet)
 conflicts=(zeronet)
-source=("git+https://github.com/zeronet-conservancy/zeronet-conservancy.git#branch=master"
+source=("git+https://github.com/zeronet-conservancy/zeronet-conservancy.git#tag=v${pkgver}"
         "zeronet.conf"
         "zeronet.service")
 install="zeronet.install"
 backup=("etc/zeronet.conf")
 options=(!strip) # attempt to strip binaries fromA dependent libs fial
 
-pkgver() {
-  cd "$srcdir/$_gitname"
-
-  # Extract version and revision from src/Config.py and append commit
-  echo -n $(grep -oP '(?<=self.version = ").+(?=")' src/Config.py).r$(grep -oP '(?<=self.rev = )\w+$' src/Config.py).g$(git rev-parse --short HEAD)
-}
-
 package() {
    cd "$srcdir/$_gitname"