version 1:r75-c1f52fd-1

 - some build corrections
 - added provides and conflicts
 - proper VCS Guidlines version numbering
 - libxinerama dependency

2 files changed, 19 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4f59b0dd952b..ab6aabe2e628 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,18 @@
 pkgbase = catwm-git
 	pkgdesc = Cute And Tiny Window Manager
-	pkgver = 20140202
+	pkgver = r75.c1f52fd
 	pkgrel = 1
+	epoch = 1
 	url = http://github.com/pyknite/catwm
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = git
-	depends = libx11
+	depends = libxinerama
+	provides = catwm
+	conflicts = catwm
 	options = !libtool
-	source = git+https://github.com/mytch444/catwm.git
+	source = catwm-git::git+https://github.com/mytch444/catwm.git
 	md5sums = SKIP
 
 pkgname = catwm-git
diff --git a/PKGBUILD b/PKGBUILD
index 037704750bb7..54de25ce3cce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,32 @@
 pkgname=catwm-git
-pkgver=20140202
+_pkgname=catwm
+pkgver=r75.c1f52fd
 pkgrel=1
+epoch=1
 pkgdesc="Cute And Tiny Window Manager"
 url="http://github.com/pyknite/catwm"
 license=('GPL')
-depends=('libx11')
+depends=('libxinerama')
 makedepends=('git')
 arch=(i686 x86_64)
+provides=($_pkgname)
+conflicts=($_pkgname)
 options=(!libtool)
-source='git+https://github.com/mytch444/catwm.git'
+source="$pkgname::git+https://github.com/mytch444/catwm.git"
 md5sums=('SKIP')
-_gitname="catwm"
  
 pkgver() {
-  cd "$_gitname"
-  git show -s --format="%ci" HEAD | sed -e 's/-//g' -e 's/ .*//'
+  cd $pkgname
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+# git show -s --format="%ci" HEAD | sed -e 's/-//g' -e 's/ .*//'
 }
 
 build() {
-  cd $srcdir/$_gitname
+  cd $pkgname
   make PREFIX=/usr 
 }
 
 package() {
-  cd $srcdir/$_gitname
-  make BINDIR=${pkgdir}/usr/bin install
+  cd $pkgname
+  make PREFIX=/usr BINDIR="${pkgdir}/usr/bin" install
 }