Update to v1.14.0-2

2 files changed, 60 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6e69bac5d445..0e274231fb9a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,28 @@
 pkgbase = python-manilaclient
-	pkgdesc = Python client library for Manila
+	pkgdesc = Client library for OpenStack Manila API
 	pkgver = 1.14.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://docs.openstack.org/developer/python-manilaclient
 	arch = any
 	license = Apache
+	checkdepends = python-pbr
+	checkdepends = python-oslo-config
+	checkdepends = python-oslo-log
+	checkdepends = python-oslo-serialization
+	checkdepends = python-oslo-utils
+	checkdepends = python-prettytable
+	checkdepends = python-requests
+	checkdepends = python-simplejson
+	checkdepends = python-babel
+	checkdepends = python-six
+	checkdepends = python-keystoneclient
+	checkdepends = python-ddt
+	checkdepends = python-fixtures
+	checkdepends = python-mock
+	checkdepends = python-oslotest
+	checkdepends = python-testtools
+	checkdepends = python-tempest
+	makedepends = git
 	makedepends = python-setuptools
 	makedepends = python2-setuptools
 	source = git+https://git.openstack.org/openstack/python-manilaclient#tag=1.14.0
diff --git a/PKGBUILD b/PKGBUILD
index dc508d2b863e..89e82aa7becb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,39 +2,66 @@
 
 pkgname=('python-manilaclient' 'python2-manilaclient')
 pkgver='1.14.0'
-pkgrel='1'
-pkgdesc='Python client library for Manila'
+pkgrel='2'
+pkgdesc='Client library for OpenStack Manila API'
 arch=('any')
-url='http://docs.openstack.org/developer/python-manilaclient'
+url="http://docs.openstack.org/developer/${pkgname}"
 license=('Apache')
-makedepends=('python-setuptools' 'python2-setuptools')
-source=("git+https://git.openstack.org/openstack/python-manilaclient#tag=$pkgver")
+makedepends=('git' 'python-setuptools' 'python2-setuptools')
+source=("git+https://git.openstack.org/openstack/${pkgname}#tag=${pkgver}")
+checkdepends=('python-pbr'
+              'python-oslo-config'
+              'python-oslo-log'
+              'python-oslo-serialization'
+              'python-oslo-utils'
+              'python-prettytable'
+              'python-requests'
+              'python-simplejson'
+              'python-babel'
+              'python-six'
+              'python-keystoneclient'
+              'python-ddt'
+              'python-fixtures'
+              'python-mock'
+              'python-oslotest' 
+              'python-testtools' 
+              'python-tempest')
 md5sums=('SKIP')
 
 prepare() {
-  cp -a python-manilaclient{,-py2}
+  cp -a "${srcdir}/${pkgname}"{,-py2}
 }
 
 build() {
-  cd "$srcdir"/python-manilaclient
+  cd "${srcdir}/${pkgname}"
   python setup.py build
 
-  cd "$srcdir"/python-manilaclient-py2
+  cd "${srcdir}/${pkgname}-py2"
   python2 setup.py build
 }
 
+check() {
+  cd "${srcdir}/${pkgname}"
+  python setup.py testr
+
+  #cd "${srcdir}/${pkgname}-py2"
+  #PYTHON=python2 python2 setup.py testr
+}
+
 package_python-manilaclient() {
   depends=('python-oslo-config' 'python-oslo-log' 'python-oslo-serialization'
-           'python-oslo-utils' 'python-pbr' 'python-prettytable' 'python-requests'
-           'python-simplejson' 'python-babel' 'python-six' 'python-keystoneclient')
+           'python-oslo-utils' 'python-pbr' 'python-prettytable'
+           'python-requests' 'python-simplejson' 'python-babel' 'python-six'
+           'python-keystoneclient')
   cd "${srcdir}/${pkgname}"
   python setup.py install --root="${pkgdir}" --optimize=1
 }
 
 package_python2-manilaclient() {
-  depends=('python2-oslo-config' 'python2-oslo-log' 'python2-oslo-serialization'
-           'python2-oslo-utils' 'python2-pbr' 'python2-prettytable' 'python2-requests'
-           'python2-simplejson' 'python2-babel' 'python2-six' 'python2-keystoneclient')
+  depends=('python2-oslo-config' 'python2-oslo-log'
+           'python2-oslo-serialization' 'python2-oslo-utils' 'python2-pbr'
+           'python2-prettytable' 'python2-requests' 'python2-simplejson'
+           'python2-babel' 'python2-six' 'python2-keystoneclient')
   cd "${srcdir}/python-manilaclient-py2"
   python2 setup.py install --root="${pkgdir}" --optimize=1
   mv "${pkgdir}"/usr/bin/manila{,2}