misc changes/improvements

3 files changed, 17 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 87ad661a73e2..6595c157092d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-hashpumpy-git
 	pkgdesc = A tool to exploit the hash length extension attack in various hashing algorithms
-	pkgver = v1.2.0.r8.g314268e
-	pkgrel = 2
+	pkgver = 1.2.0.r8.g314268e
+	pkgrel = 1
 	url = https://github.com/bwall/HashPump
 	arch = i686
 	arch = x86_64
@@ -9,7 +9,8 @@ pkgbase = python-hashpumpy-git
 	makedepends = git
 	depends = openssl
 	depends = python
-	provides = python-hashpumpy
+	provides = python-hashpumpy=1.2.0.r8.g314268e
+	conflicts = python-hashpumpy
 	source = python-hashpumpy::git+https://github.com/bwall/HashPump
 	md5sums = SKIP
 
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index f7c1169a1d2a..000000000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/python-hashpumpy
diff --git a/PKGBUILD b/PKGBUILD
index 506fc73d0ae4..74f3753e81da 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,41 +2,41 @@
 
 _pkgname=python-hashpumpy
 pkgname=$_pkgname-git
-pkgver=v1.2.0.r8.g314268e
-pkgrel=2
+pkgver=1.2.0.r8.g314268e
+pkgrel=1
 pkgdesc=" A tool to exploit the hash length extension attack in various hashing algorithms"
 arch=("i686" "x86_64")
 url="https://github.com/bwall/HashPump"
 license=('MIT')
 makedepends=('git')
 depends=('openssl' 'python')
-provides=("$_pkgname")
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
 source=("$_pkgname"::"git+https://github.com/bwall/HashPump")
 md5sums=('SKIP')
 
 pkgver() {
-    cd "${srcdir}/${_pkgname}"
-    git describe --long --tags | sed -E 's/([^-]*-g)/r\1/;s/-/./g'
+    cd $_pkgname
+    git describe --long --tags | sed -E 's/([^-]*-g)/r\1/;s/-/./g;s/^v//'
 }
 
 build() {
-    cd "${srcdir}/${_pkgname}"
+    cd $_pkgname
     python setup.py build
 }
 
 check() {
-    cd "${srcdir}/${_pkgname}"
+    cd $_pkgname
 
-    pyver=$(python -c 'import sysconfig; print(sysconfig.get_config_var("VERSION"))')
-    export PYTHONPATH="$(pwd)/build/lib.linux-$CARCH-$pyver:$PYTHONPATH"
+    export PYTHONPATH="$(pwd)/build/lib.linux-$CARCH-3.7:$PYTHONPATH"
     python test.py
 }
 
 package() {
-    cd "${srcdir}/${_pkgname}"
-    python setup.py install --skip-build --root="${pkgdir}"
+    cd $_pkgname
 
-    install -Dm755 -d "$pkgdir/usr/share/licenses/$pkgname/"
-    install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/"
+    python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+
+    install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
 }