Forgot to add most files...

2 files changed, 12 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0494e24c553b..85b4de5a6854 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,15 @@
 pkgbase = minisat-git
 	pkgdesc = A minimalistic and high-performance SAT solver
-	pkgver = 2.2.0.r303.37dc6c6
-	pkgrel = 1
+	pkgver = 2.2.0.r68.g37dc6c6
+	pkgrel = 2
 	url = http://minisat.se/
 	arch = i686
 	arch = x86_64
 	license = MIT
 	makedepends = git
 	makedepends = cmake
-	source = minisat::git+https://github.com/niklasso/minisat.git
+	conflicts = minisat
+	source = minisat-git::git+https://github.com/niklasso/minisat.git
 	md5sums = SKIP
 
 pkgname = minisat-git
diff --git a/PKGBUILD b/PKGBUILD
index a79148036d7b..57b3e88f0657 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,22 @@
 pkgname=minisat-git
-pkgver=2.2.0.r303.37dc6c6
-pkgrel=1
+pkgver=2.2.0.r68.g37dc6c6
+pkgrel=2
 pkgdesc='A minimalistic and high-performance SAT solver'
 arch=('i686' 'x86_64')
 url="http://minisat.se/"
 license=('MIT')
 makedepends=('git' 'cmake')
-_gitname=minisat
-source=($_gitname::git+https://github.com/niklasso/minisat.git)
+conflicts=('minisat')
+source=($pkgname::git+https://github.com/niklasso/minisat.git)
 md5sums=('SKIP')
 
 pkgver() {
-    cd "${_gitname}"
-    printf '2.2.0.r%s.%s' $(git rev-list --count HEAD) $(git rev-parse --short HEAD)
+  cd "$pkgname"
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^releases\///'
 }
 
 build() {
-    cd "${srcdir}/${_gitname}"
+    cd "$srcdir/$pkgname"
 
     mkdir build
     cd build
@@ -25,7 +25,7 @@ build() {
 }
 
 package() {
-    cd "${srcdir}/${_gitname}"
+    cd "$srcdir/$pkgname"
 
     cd build
     make DESTDIR="$pkgdir/" install