From 81617820403f9a5508cc489dfa7bd825e168d2b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Thu, 9 Oct 2014 15:34:45 +0200
Subject: [PATCH] - update device_cio_free script - udpate Requires for ziomon
 subpackage

---
 device_cio_free |  2 +-
 s390utils.spec  | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/device_cio_free b/device_cio_free
index b4c3750..cd2b21f 100644
--- a/device_cio_free
+++ b/device_cio_free
@@ -101,7 +101,6 @@ wait_on_devices()
     if [ -w $CIO_SETTLE ]; then
 	[ $VERBOSE ] && echo "Waiting until all pending CIO requests are processed"
 	echo 1 > $CIO_SETTLE
-	udevadm settle
 	return
     fi
 
@@ -249,6 +248,7 @@ if [ "$DEVICE" ]; then
     [ $VERBOSE ] && echo "Freeing specific devices"
     free_device $DEVICE
     wait_on_devices
+    udevadm settle
     exit 0
 fi
 
diff --git a/s390utils.spec b/s390utils.spec
index 2a5590b..fbfa7f2 100644
--- a/s390utils.spec
+++ b/s390utils.spec
@@ -5,7 +5,7 @@ Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
 Version:        1.23.0
-Release:        12%{?dist}
+Release:        13%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 ExclusiveArch:  s390 s390x
@@ -593,7 +593,17 @@ fi
 License:        GPLv2
 Summary:        S390 ziomon tools
 Group:          Applications/System
-Requires:       perl lsscsi coreutils blktrace >= 1.0.1
+Requires:       blktrace
+Requires:       coreutils
+Requires:       device-mapper-multipath
+Requires:       gawk
+Requires:       grep
+Requires:       lsscsi
+Requires:       procps-ng
+Requires:       rsync
+Requires:       sed
+Requires:       tar
+Requires:       util-linux
 
 %description ziomon
 Tool set to collect data for zfcp performance analysis and report.
@@ -736,6 +746,10 @@ User-space development files for the s390/s390x architecture.
 
 
 %changelog
+* Thu Oct 09 2014 Dan Horák <dan[at]danny.cz> - 2:1.23.0-13
+- update device_cio_free script
+- udpate Requires for ziomon subpackage
+
 * Wed Jun 11 2014 Dan Horák <dan[at]danny.cz> - 2:1.23.0-12
 - update for -Werror=format-security