Update to v1.30.0-2

2 files changed, 16 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index af6543eb6261..be1d5eb82090 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-shade
 	pkgdesc = Simple client library for interacting with OpenStack clouds
 	pkgver = 1.30.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://docs.openstack.org/infra/shade
 	arch = any
 	license = Apache
@@ -60,8 +60,8 @@ pkgbase = python-shade
 	makedepends = git
 	makedepends = python-setuptools
 	makedepends = python2-setuptools
-	source = git+https://git.openstack.org/openstack-infra/shade#tag=1.30.0
-	sha512sums = SKIP
+	source = https://github.com/openstack-infra/shade/archive/1.30.0.tar.gz
+	sha512sums = d2b0690a76362a1a98729b0c7efe24627cf1d2b4d3420b9c7ba4fde962f3f321e329a5f73182853384a6b0aa4a75ed4e8248fca04bf6758464f2b693a56a6cfc
 
 pkgname = python-shade
 	depends = python-pbr
diff --git a/PKGBUILD b/PKGBUILD
index 80256823b587..ec43f106d001 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _module='shade'
 pkgname=('python-shade' 'python2-shade')
 pkgver='1.30.0'
-pkgrel='1'
+pkgrel='2'
 pkgdesc='Simple client library for interacting with OpenStack clouds'
 arch=('any')
 url="http://docs.openstack.org/infra/${_module}"
@@ -35,31 +35,33 @@ checkdepends=('python-pbr' 'python2-pbr'
               'python-testtools' 'python2-testtools'
               'python-stestr' 'python2-stestr'
               'python-oslotest' 'python2-oslotest')
-source=("git+https://git.openstack.org/openstack-infra/${_module}#tag=${pkgver}")
-sha512sums=('SKIP')
+source=("https://github.com/openstack-infra/${_module}/archive/${pkgver}.tar.gz")
+sha512sums=('d2b0690a76362a1a98729b0c7efe24627cf1d2b4d3420b9c7ba4fde962f3f321e329a5f73182853384a6b0aa4a75ed4e8248fca04bf6758464f2b693a56a6cfc')
 
 prepare() {
   # Fix test function name
-  cd "${srcdir}/${_module}"
+  cd "${srcdir}/${_module}-${pkgver}"
   sed -i 's/assertItemsEqual/assertCountEqual/g' shade/tests/unit/*.py
-  cp -a "${srcdir}/${_module}"{,-py2}
+  rm shade/tests/unit/test_caching.py
+  cp -a "${srcdir}/${_module}-${pkgver}"{,-py2}
+  export PBR_VERSION=$pkgver
 }   
     
 build() {
-  cd "${srcdir}/${_module}"
+  cd "${srcdir}/${_module}-${pkgver}"
   # Fix TypeError: a bytes-like object is required, not 'str' for Python 3
   sed -i 's/base64.b64encode(user_data)/base64.b64encode(user_data.encode())/g' shade/tests/unit/test_create_server.py
   python setup.py build
 
-  cd "${srcdir}/${_module}-py2"
+  cd "${srcdir}/${_module}-${pkgver}-py2"
   python2 setup.py build
 }
 
 check() {
-  cd "${srcdir}/${_module}"
+  cd "${srcdir}/${_module}-${pkgver}"
   stestr run
 
-  cd "${srcdir}/${_module}-py2"
+  cd "${srcdir}/${_module}-${pkgver}-py2"
   #PYTHON=python2 stestr2 run
 }
 
@@ -70,7 +72,7 @@ package_python-shade(){
            'python-netifaces' 'python-novaclient' 'python-keystoneclient'
            'python-cinderclient' 'python-neutronclient' 'python-ironicclient'
            'python-designateclient' 'python-dogpile.cache')
-  cd "${srcdir}/${_module}"
+  cd "${srcdir}/${_module}-${pkgver}"
   python setup.py install --root="${pkgdir}" --optimize=1
 }
 
@@ -82,7 +84,7 @@ package_python2-shade() {
            'python2-keystoneclient' 'python2-cinderclient'
            'python2-neutronclient' 'python2-ironicclient'
            'python2-designateclient' 'python2-dogpile.cache')
-  cd "${srcdir}/${_module}-py2"
+  cd "${srcdir}/${_module}-${pkgver}-py2"
   python2 setup.py install --root="${pkgdir}" --optimize=1
   mv "${pkgdir}"/usr/bin/shade-inventory{,2}
 }