Update to v1.25.0-2

2 files changed, 15 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cdd3838ba43e..20461e2e73ab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-manilaclient
 	pkgdesc = Client library for OpenStack Manila API
 	pkgver = 1.25.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://docs.openstack.org/developer/python-manilaclient
 	arch = any
 	license = Apache
@@ -40,11 +40,10 @@ pkgbase = python-manilaclient
 	checkdepends = python-stestr
 	checkdepends = python2-stestr
 	checkdepends = python-tempest
-	makedepends = git
 	makedepends = python-setuptools
 	makedepends = python2-setuptools
-	source = git+https://git.openstack.org/openstack/python-manilaclient#tag=1.25.0
-	sha512sums = SKIP
+	source = https://github.com/openstack/python-manilaclient/archive/1.25.0.tar.gz
+	sha512sums = 2b33cbba0376510c25aa9aeaef9009374308af3319052637cd13e153ecd8c3a5f7385b0df0fc8cd19d7ddf3f3a2e5d2cde9fa8b5402b148a25504b18294b82b5
 
 pkgname = python-manilaclient
 	depends = python-oslo-config
diff --git a/PKGBUILD b/PKGBUILD
index 1ee9afcf9ea1..18c0e190d009 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,13 @@
 
 pkgname=('python-manilaclient' 'python2-manilaclient')
 pkgver='1.25.0'
-pkgrel='1'
+pkgrel='2'
 pkgdesc='Client library for OpenStack Manila API'
 arch=('any')
 url="http://docs.openstack.org/developer/${pkgname}"
 license=('Apache')
-makedepends=('git' 'python-setuptools' 'python2-setuptools')
-source=("git+https://git.openstack.org/openstack/${pkgname}#tag=${pkgver}")
+makedepends=('python-setuptools' 'python2-setuptools')
+source=("https://github.com/openstack/${pkgname}/archive/${pkgver}.tar.gz")
 checkdepends=('python-pbr' 'python2-pbr'
               'python-oslo-config' 'python2-oslo-config'
               'python-oslo-log' 'python2-oslo-log'
@@ -27,24 +27,25 @@ checkdepends=('python-pbr' 'python2-pbr'
               'python-testtools' 'python2-testtools'
               'python-stestr' 'python2-stestr'
               'python-tempest')
-sha512sums=('SKIP')
+sha512sums=('2b33cbba0376510c25aa9aeaef9009374308af3319052637cd13e153ecd8c3a5f7385b0df0fc8cd19d7ddf3f3a2e5d2cde9fa8b5402b148a25504b18294b82b5')
 
 prepare() {
   # Fix tests where ~ is not replaced with %7E
-  sed -i 's/%7E/~/' "${srcdir}/${pkgname}"/manilaclient/tests/unit/v2/*.py
-  cp -a "${srcdir}/${pkgname}"{,-py2}
+  sed -i 's/%7E/~/' "${srcdir}/${pkgname}-${pkgver}"/manilaclient/tests/unit/v2/*.py
+  cp -a "${srcdir}/${pkgname}-${pkgver}"{,-py2}
+  export PBR_VERSION=$pkgver
 }
 
 build() {
-  cd "${srcdir}/${pkgname}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   python setup.py build
 
-  cd "${srcdir}/${pkgname}-py2"
+  cd "${srcdir}/${pkgname}-${pkgver}-py2"
   python2 setup.py build
 }
 
 check() {
-  cd "${srcdir}/${pkgname}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   stestr run
 
   # No python2-tempest
@@ -57,7 +58,7 @@ package_python-manilaclient() {
            'python-oslo-utils' 'python-pbr' 'python-prettytable'
            'python-requests' 'python-simplejson' 'python-babel' 'python-six'
            'python-keystoneclient')
-  cd "${srcdir}/${pkgname}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   python setup.py install --root="${pkgdir}" --optimize=1
 }
 
@@ -66,7 +67,7 @@ package_python2-manilaclient() {
            '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"
+  cd "${srcdir}/python-manilaclient-${pkgver}-py2"
   python2 setup.py install --root="${pkgdir}" --optimize=1
   mv "${pkgdir}"/usr/bin/manila{,2}
 }