version bump, cleaning up some missing doc installation

5 files changed, 23 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e7e17635abfc..48cbb94b20b0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Nov 24 23:05:31 UTC 2017
+# Sun Jul  8 00:13:00 UTC 2018
 pkgbase = iozone
 	pkgdesc = A filesystem benchmark tool
-	pkgver = 3.471
-	pkgrel = 2
+	pkgver = 3.482
+	pkgrel = 1
 	url = http://www.iozone.org/
 	install = iozone.install
 	arch = i686
@@ -11,9 +11,9 @@ pkgbase = iozone
 	license = custom
 	depends = sh
 	optdepends = gnuplot: for generating graph reports
-	source = http://www.iozone.org/src/current/iozone3_471.tar
-	source = iozone3_471.tar.sig
-	sha512sums = c61b2b8b5af3dccdb99b26aef8a0a4f2f5f467fc3985ac72ed4bb4fb36e4b7684ca6dbaa5bbc05ae0a4e73852e048e9fd2495eda9313f5abc4e631499d683aec
+	source = http://www.iozone.org/src/current/iozone3_482.tar
+	source = iozone3_482.tar.sig
+	sha512sums = 05aec9a6be296340a243cc5beb848dd5405a197fe7c2c4ba0d0a209f907c18f372cef259f55303b013d10ccef5370f2ff76f524840ee155000efaeea86136a5d
 	sha512sums = SKIP
 
 pkgname = iozone
diff --git a/PKGBUILD b/PKGBUILD
index fee52d3c5bb0..aad6621059fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,9 +5,9 @@ validpgpkeys=('748231EBCBD808A14F5E85D28C004C2F93481F6B')
 # Past maintainer: Joris Steyn <jorissteyn@gmail.com>
 # Contributor: TDY <tdy@gmx.com>
 pkgname=iozone
-pkgver=3.471
+pkgver=3.482
 _pkgver=${pkgver/./_}
-pkgrel=2
+pkgrel=1
 pkgdesc="A filesystem benchmark tool"
 arch=('i686' 'x86_64')
 url="http://www.iozone.org/"
@@ -17,7 +17,7 @@ optdepends=('gnuplot: for generating graph reports')
 install=$pkgname.install
 source=("http://www.${pkgname}.org/src/current/${pkgname}${_pkgver}.tar"
 	"${pkgname}${_pkgver}.tar.sig")
-sha512sums=('c61b2b8b5af3dccdb99b26aef8a0a4f2f5f467fc3985ac72ed4bb4fb36e4b7684ca6dbaa5bbc05ae0a4e73852e048e9fd2495eda9313f5abc4e631499d683aec'
+sha512sums=('05aec9a6be296340a243cc5beb848dd5405a197fe7c2c4ba0d0a209f907c18f372cef259f55303b013d10ccef5370f2ff76f524840ee155000efaeea86136a5d'
 	    'SKIP')
 
 build() {
@@ -30,18 +30,25 @@ build() {
 package() {
 	cd "${srcdir}/${pkgname}${_pkgver}/src/current"
 
-	_examples=/usr/share/doc/iozone3/examples
+	_examples=usr/share/doc/iozone3
 
 	install -Dm755 iozone ${pkgdir}/usr/bin/iozone
 	install -Dm755 fileop ${pkgdir}/usr/bin/fileop
 	install -Dm755 pit_server ${pkgdir}/usr/bin/pit_server
 	install -Dm644 ../../docs/$pkgname.1 ${pkgdir}/usr/share/man/man1/$pkgname.1
 
-	for i in gnuplotps.dem gnu3d.dem gnuplot.dem Gnuplot.txt client_list; do
-		install -Dm644 $i ${pkgdir}/$_examples/$i
-	done
+	#for i in gnuplotps.dem gnu3d.dem gnuplot.dem Gnuplot.txt client_list; do
+	#	install -Dm644 $i ${pkgdir}/$_examples/$i
+	#done
 
-	for i in Generate_Graphs iozone_visualizer.pl gengnuplot.sh report.pl; do
-		install -Dm755 $i ${pkgdir}/$_examples/$i
+	#for i in Generate_Graphs iozone_visualizer.pl gengnuplot.sh report.pl; do
+	#	install -Dm755 $i ${pkgdir}/$_examples/$i
+	#done
+	for i in $(find ${srcdir}/${pkgname}${_pkgver}/docs -type f);
+	do
+		mode=$(stat -c "%a %n" ${i} | awk '{print $1}')
+		fname=$(basename ${i})
+		install -Dm${mode} ${i} ${pkgdir}/usr/share/doc/${pkgname}/${fname}
 	done
+
 }
diff --git a/iozone.install b/iozone.install
index 546f8bb56d5f..7ab723b46ad4 100644
--- a/iozone.install
+++ b/iozone.install
@@ -1,7 +1,6 @@
 post_install() {
   echo ">>> Iozone usage: man iozone"
-  echo ">>> Rules for accurate results: /usr/share/doc/iozone/Guidelines.doc"
-  echo ">>> How to plot results: /usr/share/doc/iozone/Generate_Graphs.txt"
+  echo ">>> Further documentation is available in /usr/share/doc/iozone"
 }
 
 post_upgrade() {
diff --git a/iozone3_471.tar.sig b/iozone3_471.tar.sig
deleted file mode 100644
index 3323e02e97b4..000000000000
--- a/iozone3_471.tar.sig
+++ /dev/null
diff --git a/iozone3_482.tar.sig b/iozone3_482.tar.sig
new file mode 100644
index 000000000000..c687e481da33
--- /dev/null
+++ b/iozone3_482.tar.sig