version 1:0.6.2.r48.gceeae62-1

2 files changed, 18 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c0e4159a74a1..ace41b7ba10e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,8 @@
 pkgbase = herbstluftwm-git
 	pkgdesc = Manual tiling window manager for X
-	pkgver = v0.6.2.48.gceeae62
+	pkgver = 0.6.2.r48.gceeae62
 	pkgrel = 1
+	epoch = 1
 	url = http://wwwcip.cs.fau.de/~re06huxa/herbstluftwm
 	arch = i686
 	arch = x86_64
@@ -18,7 +19,7 @@ pkgbase = herbstluftwm-git
 	optdepends = dzen2-xft-xpm-xinerama-svn: view icons as tags
 	provides = herbstluftwm
 	conflicts = herbstluftwm
-	source = git://git.informatik.uni-erlangen.de/re06huxa/herbstluftwm
+	source = herbstluftwm-git::git://git.informatik.uni-erlangen.de/re06huxa/herbstluftwm
 	md5sums = SKIP
 
 pkgname = herbstluftwm-git
diff --git a/PKGBUILD b/PKGBUILD
index 2cdc96c6c4a3..e62ac86b134f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,14 @@
 # Maintainer: thorsten w. <p@thorsten-wissmann.de>
 pkgname=herbstluftwm-git
-pkgver=v0.6.2.48.gceeae62
+_pkgname=herbstluftwm
+pkgver=0.6.2.r48.gceeae62
 pkgrel=1
+epoch=1
 pkgdesc="Manual tiling window manager for X"
 arch=('i686' 'x86_64')
-url="http://wwwcip.cs.fau.de/~re06huxa/herbstluftwm"
+url="http://wwwcip.cs.fau.de/~re06huxa/$_pkgname"
 license=('BSD')
-depends=( 'glib2>=2.24' libx11 libxinerama )
+depends=( 'glib2>=2.24' 'libx11' 'libxinerama')
 optdepends=(
         'bash: needed by most scripts'
         'xterm: used by the default autostart'
@@ -14,27 +16,24 @@ optdepends=(
         'dzen2-git: needed by panel.sh'
         'dzen2-xft-xpm-xinerama-svn: view icons as tags'
     )
-makedepends=( git asciidoc )
-provides=( herbstluftwm )
-conflicts=( herbstluftwm )
-backup=( )
-source=("git://git.informatik.uni-erlangen.de/re06huxa/herbstluftwm")
+makedepends=('git' 'asciidoc')
+provides=($_pkgname)
+conflicts=($_pkgname)
+source=("$pkgname::git://git.informatik.uni-erlangen.de/re06huxa/$_pkgname")
 md5sums=( SKIP )
-_gitname="herbstluftwm"
 
 pkgver() {
-  cd "${srcdir}/${_gitname}"
-  git describe --always | sed 's|-|.|g'
+  cd ${pkgname}
+  git describe --tags --long | sed -r 's,^[^0-9]*,,;s,([^-]*-g),r\1,;s,[-_],.,g'
 }
 
 build() {
-  cd "${srcdir}/${_gitname}"
-  make PREFIX=/usr DESTDIR="$pkgdir" VERSION_SUFFIX="-git"
+  cd ${pkgname}
+  make PREFIX=/usr
 }
 
 package() {
-  cd "${srcdir}/${_gitname}"
-  pwd
-  make PREFIX=/usr DESTDIR="$pkgdir" VERSION_SUFFIX="-git" install
+  cd ${pkgname}
+  make PREFIX=/usr DESTDIR="$pkgdir" install
   install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }