Updated: PKGBUILD

2 files changed, 22 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fcec5480f776..c6a3e8ba0951 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = python-fuel-git
 	pkgdesc = A data pipeline framework for machine learning.
-	pkgver = 497.732f35e
+	pkgver = 0.1.1.r289.g1d6292d
 	pkgrel = 1
 	url = https://github.com/mila-udem/fuel
 	arch = x86_64
@@ -13,7 +13,7 @@ pkgbase = python-fuel-git
 	depends = python-h5py
 	depends = python-pytables
 	depends = python-pyyaml
-	depends = python-picklable-itertools-git
+	depends = python-picklable-itertools
 	provides = python-fuel
 	source = git+https://github.com/mila-udem/fuel.git
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 30f9c504abc4..45f1c39f4dfb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,47 @@
-# Maintainer:  Tim Jester-Pfadt <t.jp at gmx.de>
+# Maintainer:
+# Contributor: Felix Golatofski <contact@xdfr.de>
+# Contributor: Tim Jester-Pfadt <t.jp at gmx.de>
 
 pkgname=python-fuel-git
-pkgver=497.732f35e
+pkgver=0.1.1.r289.g1d6292d
 pkgrel=1
 pkgdesc='A data pipeline framework for machine learning.'
 arch=(x86_64)
 url='https://github.com/mila-udem/fuel'
 license=('MIT')
-depends=('python' 'python-pyzmq' 'python-progressbar' 'python-h5py' 'python-pytables' 'python-pyyaml' 'python-picklable-itertools-git')
+depends=('python' 'python-pyzmq' 'python-progressbar' 'python-h5py' 'python-pytables' 'python-pyyaml' 'python-picklable-itertools')
 source=('git+https://github.com/mila-udem/fuel.git')
 sha256sums=('SKIP')
 makedepends=('git' 'python-setuptools')
 provides=('python-fuel')
 
 pkgver() {
-	cd "$srcdir"/fuel
-  	echo $(git rev-list --count master).$(git rev-parse --short master)
+  cd "$srcdir/fuel"
+  # cutting off 'v' prefix that presents in the git tag
+  git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-  	cd fuel
-  	python setup.py build
+  cd "$srcdir/fuel"
+  python setup.py build
 }
 
 check() {
-  	cd fuel
-  	python setup.py test --verbose
+  cd "$srcdir/fuel"
+  python setup.py test --verbose
 }
 
 package() {
-  	cd fuel
+  cd "$srcdir/fuel"
 
-  	# We don't need anything related to git in the package
-  	rm -rf .git*
+  # We don't need anything related to git in the package
+  rm -rf .git*
 
-  	# script tries to force develop mode - force install mode by echoing install to the script
-  	echo "install" | python setup.py install --root="${pkgdir}" --optimize=1
+  python setup.py install --root="${pkgdir}" --optimize=1
 
-  	# Install License
-  	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  # Install License
+  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
-  	# Install Documentation
-  	install -D -m644 README.rst "${pkgdir}/usr/share/doc/${pkgname}/README.md"
+  # Install Documentation
+  install -D -m644 README.rst "${pkgdir}/usr/share/doc/${pkgname}/README.md"
 }