Resubmit. GTK3 version from git

1 files changed, 24 insertions, 19 deletions

diff --git a/PKGBUILD b/PKGBUILD
index eb61b9d75fb5..61a52e22d7c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,38 @@
-# Maintainer: Diego <cdprincipe@at@gmail@dot@com>
-#Contributor: Gadget3000 <gadget3000 at msn dot com>
+#Maintainer:  twa022 <twa022 at gmail dot com>
 
 _pkgname=thunar-volman
-pkgname=thunar-volman-git
-pkgver=434.c6164e9
+pkgname=${_pkgname}-git
+epoch=1
+pkgver=0.8.1.r67.g158c666
 pkgrel=1
-pkgdesc="automatic management for removeable devices in thunar"
+pkgdesc="automatic management for removeable devices in thunar ("
 arch=(i686 x86_64)
 license=('GPL2')
 url="http://goodies.xfce.org/projects/thunar-plugins/thunar-volman"
 groups=('xfce4-goodies-git')
-#depends=('thunar-git' 'libxfce4ui' 'hicolor-icon-theme')
-depends=('thunar' 'libxfce4ui' 'hicolor-icon-theme')
-makedepends=('git' 'intltool' 'pkgconfig' 'xfce4-dev-tools')
-conflicts=(thunar-volman)
-provides=(thunar-volman)
+depends=('thunar-git' 'hicolor-icon-theme')
+makedepends=('git' 'intltool' 'xfce4-dev-tools')
+conflicts=("${_pkgname}")
+provides=("${_pkgname}=${pkgver%\.r*}")
 options=('!libtool')
-install=${pkgname}.install
-source=('git://git.xfce.org/xfce/thunar-volman')
-md5sums=('SKIP')
+source=("${_pkgname}::git+https://github.com/andreldm/thunar-volman"
+        'missing_parenthesis.patch')
+#source=("${_pkgname}::git://git.xfce.org/xfce/thunar-volman")
+sha256sums=('SKIP'
+            '96564d3cde55ae449a04b7016054c0bf1a8962c928f44d37247028f3fa836a64')
 
 pkgver() {
-  cd "$srcdir/$_pkgname"
-#  git describe --always | sed 's|-|.|g'
-  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+  cd "${srcdir}/${_pkgname}"
+  git describe --long --tags | sed -r "s/^${_pkgname}.//;s/([^-]*-g)/r\1/;s/-/./g"
+}
+
+prepare() {
+  cd "${srcdir}/${_pkgname}"
+  patch -uNp2 -r- -i ../missing_parenthesis.patch
 }
 
 build() {
-  cd "$srcdir/$_pkgname"
+  cd "${srcdir}/${_pkgname}"
   
   ./autogen.sh \
     --prefix=/usr \
@@ -40,6 +45,6 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_pkgname"
-  make DESTDIR="$pkgdir/" install
+  cd "${srcdir}/${_pkgname}"
+  make DESTDIR="${pkgdir}" install
 }