added missing dependencies, PKGBUILD rewrite

3 files changed, 38 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a3db01ceb7d8..ba306663b2fa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,23 @@
-# Generated by mksrcinfo v8
-# Wed Oct 25 07:31:57 UTC 2017
 pkgbase = torbrowser-launcher-git
 	pkgdesc = Securely and easily download, verify, install, and launch Tor Browser
-	pkgver = 0.2.8
+	pkgver = 0.3.2.r20.20b02d0
 	pkgrel = 1
 	url = https://github.com/micahflee/torbrowser-launcher
 	arch = any
-	license = BSD
+	license = MIT
 	makedepends = git
-	depends = fakeroot
+	makedepends = python-setuptools
+	depends = tor
 	depends = gnupg
 	depends = pygtk
 	depends = python-gnupg
+	depends = python-gpgme
+	depends = python-pyqt5
 	depends = python-twisted
-	depends = tor
-	depends = xz
+	provides = torbrowser-launcher
+	conflicts = torbrowser-launcher
 	source = git+https://github.com/micahflee/torbrowser-launcher.git
-	sha512sums = SKIP
+	sha256sums = SKIP
 
 pkgname = torbrowser-launcher-git
 
diff --git a/.gitignore b/.gitignore
index 0ff93a82e618..4dab8d6386e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,7 @@
-/PKGBUILD-namcap.log
-/torbrowser-launcher/
-/torbrowser-launcher-*-namcap.log
-/torbrowser-launcher-*-package.log
-/torbrowser-launcher-*.pkg.tar.xz
-/torbrowser-launcher-*-pkgver.log
-/torbrowser-launcher-*.src.tar.gz
-/torbrowser-launcher-*.src.tar.gz.sig
+# Ignore everything
+*
+
+# But not these files...
+!.gitignore
+!PKGBUILD
+!.SRCINFO
diff --git a/PKGBUILD b/PKGBUILD
index c336c756b951..934492397eaa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,31 @@
 # Maintainer: Yardena Cohen <yardenack at gmail dot com>
-
-gitname=torbrowser-launcher
-pkgname=$gitname-git
-pkgver=0.2.8
+# Co-Maintainer: Mark Wagie <yochanan dot marqos at gmail dot com>
+pkgname=torbrowser-launcher-git
+pkgver=0.3.2.r20.20b02d0
 pkgrel=1
-pkgdesc='Securely and easily download, verify, install, and launch Tor Browser'
-url=https://github.com/micahflee/$gitname
+pkgdesc="Securely and easily download, verify, install, and launch Tor Browser"
 arch=('any')
-license=('BSD')
-makedepends=(git)
-depends=(fakeroot gnupg pygtk python-gnupg python-twisted tor xz)
-source=("git+${url}.git")
-sha512sums=('SKIP')
+url="https://github.com/micahflee/torbrowser-launcher"
+license=('MIT')
+depends=('tor' 'gnupg' 'pygtk' 'python-gnupg' 'python-gpgme' 'python-pyqt5' 'python-twisted')
+makedepends=('git' 'python-setuptools')
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
+source=('git+https://github.com/micahflee/torbrowser-launcher.git')
+sha256sums=('SKIP')
 
 pkgver() {
-    cd "${srcdir}/${gitname}"
-    local ver="$(git describe --tags | sed 's|-|\.|g;s/v//g')"
-    printf "%s" "${ver//-/.}"
+    cd "$srcdir/${pkgname%-git}"
+	printf "%s" "$(git describe --long | sed 's/^v//;s/\([^-]*-\)g/r\1/;s/-/./g')"
+}
+
+build() {
+	cd "$srcdir/${pkgname%-git}"
+	python setup.py build
 }
 
 package() {
-    cd "${srcdir}/${gitname}"
-    python setup.py install --root="${pkgdir}" --optimize=1
+    cd "$srcdir/${pkgname%-git}"
+    python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
+    install -Dm644 LICENSE "$pkgdir/usr/share/licenses/${pkgname%-git}/LICENSE"
 }