one final packaging fix before sunsetting this PKGBUILD

3 files changed, 47 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2bea21388f49..4362c5898697 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,18 @@
 pkgbase = python-gym-git
 	pkgdesc = A toolkit for developing and comparing reinforcement learning algorithms.
-	pkgver = r1034.f380a0e8
+	pkgver = 0.26.2.r3.gdcd18584
 	pkgrel = 1
 	url = https://gym.openai.com
 	arch = any
 	license = MIT
 	makedepends = git
+	makedepends = python-setuptools
 	depends = python
-	depends = python-numpy>=1.10.4
-	depends = python-pyglet
-	depends = python-requests>=2.0
-	depends = python-six
-	provides = python-gym
+	depends = python-cloudpickle
+	depends = python-numpy
+	provides = python-gym=0.26.2
+	conflicts = python-gym
 	source = git+https://github.com/openai/gym
-	md5sums = SKIP
+	b2sums = SKIP
 
 pkgname = python-gym-git
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..e1cc0116832e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,17 @@
+# based on https://github.com/github/gitignore/blob/master/ArchLinuxPackages.gitignore
+*.tar
+*.tar.*
+*.rpm
+*.jar
+*.exe
+*.msi
+*.zip
+*.tgz
+*.log
+*.log.*
+
+*/
+*.orig
+*.bak
+*.backup
+*.kate-swp
diff --git a/PKGBUILD b/PKGBUILD
index d1ff1a18391d..e8c7d03d3bd1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer: Daniel Maslowski <info@orangecms.org>
+# Contributor: Daniel Maslowski <info@orangecms.org>
 
 _gitname=gym
 pkgname=python-${_gitname}-git
-pkgver=r1034.f380a0e8
+pkgver=0.26.2.r3.gdcd18584
 pkgrel=1
 pkgdesc="A toolkit for developing and comparing reinforcement learning algorithms."
 arch=('any')
@@ -10,26 +10,34 @@ url="https://gym.openai.com"
 license=('MIT')
 depends=(
   'python'
-  'python-numpy>=1.10.4'
-  'python-pyglet'
-  'python-requests>=2.0'
-  'python-six'
+  'python-cloudpickle'
+  'python-numpy'
 )
-makedepends=('git')
-provides=('python-gym')
+makedepends=('git' 'python-setuptools')
+provides=("python-gym=${pkgver%.r*}")
+conflicts=('python-gym')
 source=("git+https://github.com/openai/$_gitname")
-md5sums=('SKIP')
+b2sums=('SKIP')
 
 pkgver() {
-  cd "$_gitname"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    cd "${_gitname}"
+
+    # Generate git tag based version. Count only proper (v)#.#* [#=number] tags.
+    local _gitversion=$(git describe --long --tags --match '[v0-9][0-9.][0-9.]*' | sed -e 's|^v||' | tr '[:upper:]' '[:lower:]') 
+
+    # Format git-based version for pkgver
+    # Expected format: e.g. 1.5.0rc2.r521.g99982a1c
+    # Or in case of 'post': 1.5.0.post1.r521.g99982a1c
+    echo "${_gitversion}" | sed \
+        -e 's;^\([0-9][0-9.]*\)[-_.]\([a-zA-Z]\+\);\1\2;' \
+        -e 's;\([0-9]\+-g\);r\1;' \
+        -e 's;-;.;g' \
+        -e 's;\(post.*\);\.\1;'
 }
 
 package() {
-  cd "$srcdir/${_gitname}"
+  cd "${_gitname}"
   python setup.py install --root="$pkgdir/" --optimize=1
-  install -Dm 644 README.rst "$pkgdir/usr/share/doc/${pkgname}/README.rst"
+  install -Dm 644 README.md "$pkgdir/usr/share/doc/${pkgname}/README.md"
   install -Dm 644 LICENSE.md "$pkgdir/usr/share/licenses/${pkgname}/LICENSE.md"
 }
-
-# vim:set ts=2 sw=2 et: