fix documents

3 files changed, 22 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 56e157efd187..e2e8e287245f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-oslo-rootwrap
 	pkgdesc = Oslo Rootwrap
 	pkgver = 6.2.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://docs.openstack.org/oslo.rootwrap/latest/
 	arch = any
 	license = Apache
@@ -20,16 +20,17 @@ pkgbase = python-oslo-rootwrap
 	makedepends = python-mock
 	makedepends = python-fixtures
 	depends = python
+	depends = python-pbr
 	depends = python-six
 	options = !emptydirs
 	source = https://pypi.io/packages/source/o/oslo.rootwrap/oslo.rootwrap-6.2.0.tar.gz
 	source = 0000-lost-binary2string.patch
 	md5sums = 3dad1a7a001be9f6283bcc25ce511c39
-	md5sums = 13d2c35be1e37af81d708cfe8c96297d
+	md5sums = 781fdf0abc0d4549396493bff5a6dc22
 	sha256sums = 83e01cf523b04a2f7c1a4c9000c55bbc1b75a26391cce25b3a7c94b50cafa848
-	sha256sums = 0fb81f04ddd9f1897c11e363d1b2be61fd0940493bed50861194a3a6ee7b5e26
+	sha256sums = e61c6e768aad32df895744652a1238c32d13659b3ba2c8735b830e6e8e95b497
 	sha512sums = bf3e91ec8a18f92f6f5974a6d8369ae73dba6e61fa3001996678b85d0bfb2426536d27097ad784169e6eca50ad23471505d5089e8d4a6a84c9e0e009a6a38f5a
-	sha512sums = feaa869fb50943464b006d14633e40f43ea75243836f5c4a8ee6a916878275498ddb421d7df73c51336cc71725e7eb4498b5f7214f61394fe0ba09f58aebd11b
+	sha512sums = 3c3dd8a25956eddd8a1c8707c07c2a82fadcf4419e58d7cea72ce36f1147747f2b51fd8c02b94814d9f63189b273ed2a43f42d491dc8b0653aec56f8ebe1d846
 
 pkgname = python-oslo-rootwrap
 
diff --git a/0000-lost-binary2string.patch b/0000-lost-binary2string.patch
index 58598a7ea00d..9cb5f7c84f42 100644
--- a/0000-lost-binary2string.patch
+++ b/0000-lost-binary2string.patch
@@ -1,7 +1,7 @@
-diff --git a/oslo.rootwrap-6.2.0/oslo_rootwrap/tests/test_functional.py b/oslo.rootwrap-6.2.0-patched/oslo_rootwrap/tests/test_functional.py
+diff --git a/oslo.rootwrap-6.2.0/oslo_rootwrap/tests/test_functional.py b/oslo.rootwrap-6.2.0/oslo_rootwrap/tests/test_functional.py
 index da59b21..5b89630 100644
 --- a/oslo.rootwrap-6.2.0/oslo_rootwrap/tests/test_functional.py
-+++ b/oslo.rootwrap-6.2.0-patched/oslo_rootwrap/tests/test_functional.py
++++ b/oslo.rootwrap-6.2.0/oslo_rootwrap/tests/test_functional.py
 @@ -103,11 +103,11 @@ later_install_cmd: CommandFilter, %s, root
  
          # Should run as 'nobody'
diff --git a/PKGBUILD b/PKGBUILD
index 892dafd99f41..5c8584486498 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,13 +4,14 @@ _pyname=oslo.rootwrap
 _pycname=${_pyname/./-}
 pkgname=python-${_pycname}
 pkgver=6.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Oslo Rootwrap"
-arch=('any')
+arch=(any)
 url="https://docs.openstack.org/oslo.rootwrap/latest/"
-license=('Apache')
+license=(Apache)
 depends=(
 	python
+	python-pbr
 	python-six
 )
 makedepends=(
@@ -37,11 +38,11 @@ source=(
 	0000-lost-binary2string.patch
 )
 md5sums=('3dad1a7a001be9f6283bcc25ce511c39'
-         '13d2c35be1e37af81d708cfe8c96297d')
+         '781fdf0abc0d4549396493bff5a6dc22')
 sha256sums=('83e01cf523b04a2f7c1a4c9000c55bbc1b75a26391cce25b3a7c94b50cafa848'
-            '0fb81f04ddd9f1897c11e363d1b2be61fd0940493bed50861194a3a6ee7b5e26')
+            'e61c6e768aad32df895744652a1238c32d13659b3ba2c8735b830e6e8e95b497')
 sha512sums=('bf3e91ec8a18f92f6f5974a6d8369ae73dba6e61fa3001996678b85d0bfb2426536d27097ad784169e6eca50ad23471505d5089e8d4a6a84c9e0e009a6a38f5a'
-            'feaa869fb50943464b006d14633e40f43ea75243836f5c4a8ee6a916878275498ddb421d7df73c51336cc71725e7eb4498b5f7214f61394fe0ba09f58aebd11b')
+            '3c3dd8a25956eddd8a1c8707c07c2a82fadcf4419e58d7cea72ce36f1147747f2b51fd8c02b94814d9f63189b273ed2a43f42d491dc8b0653aec56f8ebe1d846')
 
 prepare(){
 	for i in "${source[@]}"
@@ -56,23 +57,26 @@ prepare(){
 
 build(){
 	cd $_pyname-$pkgver
+	export PYTHONPATH="$PWD"
 	python setup.py build
-	sphinx-build -b html doc/source doc/build/html
+	sphinx-build -b text doc/source doc/build/text
 }
 
 check(){
 	cd $_pyname-$pkgver
-	PYTHONPATH=${PWD} stestr run
+	stestr run
 }
 
 package(){
 	cd $_pyname-$pkgver
 	python setup.py install --root="$pkgdir/" --optimize=1
-	install -Dm644 etc/*.sample -t "$pkgdir"/usr/share/${pkgname}/conf
+	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+	install -Dm644 etc/*.sample -t "$pkgdir"/usr/share/$pkgname/conf
 	install -Dm644 etc/*.sample -t "$pkgdir"/etc/oslo
 	for i in "$pkgdir"/etc/oslo/*.sample
 	do mv -v $i ${i//.sample}
 	done
-	mkdir -p "${pkgdir}/usr/share/doc"
-	cp -r doc/build/html "${pkgdir}/usr/share/doc/${pkgname}"
+	mkdir -p "$pkgdir/usr/share/doc"
+	cp -r doc/build/text "$pkgdir/usr/share/doc/$pkgname"
+	rm -r "$pkgdir/usr/share/doc/$pkgname/.doctrees"
 }