[s390utils] updated to 1.20.0 (#804774)

[Dan Horák]

commit 80479354461b6476351644f2c45699d5b9bbd93f
Author: Dan Horák <dan at danny.cz>
Date:   Wed Dec 19 12:05:48 2012 +0100

    updated to 1.20.0 (#804774)

 .gitignore                     |    1 +
 s390-tools-1.19.0-fedora.patch |  837 ----------------------------------------
 s390-tools-1.20.0-fedora.patch |   61 +++
 s390utils.spec                 |    9 +-
 sources                        |    1 +
 5 files changed, 69 insertions(+), 840 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c95f2b8..b29664a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ src_vipa-2.0.4.tar.gz
 /s390-tools-1.16.0.tar.bz2
 /s390-tools-1.17.0.tar.bz2
 /s390-tools-1.19.0.tar.bz2
+/s390-tools-1.20.0.tar.bz2
diff --git a/s390-tools-1.20.0-fedora.patch b/s390-tools-1.20.0-fedora.patch
new file mode 100644
index 0000000..a62eded
--- /dev/null
+++ b/s390-tools-1.20.0-fedora.patch
@@ -0,0 +1,61 @@
+From 1ef1449e23dfeed77186a03f103221992029fb7e Mon Sep 17 00:00:00 2001
+From: Dan Horak <dan at danny.cz>
+Date: Sun, 20 Jul 2008 09:24:05 +0200
+Subject: [PATCH 1/2] s390-tools-1.5.3-zipl-zfcpdump-2
+
+---
+ common.mak |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/common.mak b/common.mak
+index a15e3e6..83e052f 100644
+--- a/common.mak
++++ b/common.mak
+@@ -62,8 +62,8 @@ GROUP		= $(shell id -gn)
+ export INSTROOT BINDIR LIBDIR MANDIR OWNER GROUP
+ 
+ # Special defines for zfcpdump
+-ZFCPDUMP_DIR    = /usr/local/share/zfcpdump
+-ZFCPDUMP_IMAGE  = zfcpdump.image
++ZFCPDUMP_DIR    = /boot
++ZFCPDUMP_IMAGE  = zfcpdump
+ ZFCPDUMP_RD     = zfcpdump.rd
+ export ZFCPDUMP_DIR ZFCPDUMP_IMAGE ZFCPDUMP_RD
+ 
+-- 
+1.7.7.6
+
+
+From 9d80e20eaa26d89612f2b93452c5012ea26af9a0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
+Date: Thu, 23 Apr 2009 11:46:01 +0200
+Subject: [PATCH 2/2] s390-tools-1.8.1-fdasd-su
+
+---
+ fdasd/fdasd.c |   10 ++++++----
+ 1 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/fdasd/fdasd.c b/fdasd/fdasd.c
+index ba22475..f2ac417 100644
+--- a/fdasd/fdasd.c
++++ b/fdasd/fdasd.c
+@@ -2229,10 +2229,12 @@ static void fdasd_get_geometry (fdasd_anchor_t *anc)
+ 		if (anc->verbose) printf("disk type check     : ok\n");
+ 
+ 		if (dasd_info.FBA_layout != 0) {
+-			snprintf(err_str, ERROR_STRING_SIZE,
+-				 "%s is not formatted with z/OS compatible "
+-				 "disk layout!", options.device);
+-			fdasd_error(anc, wrong_disk_format, err_str);
++			if (!anc->silent) {
++				snprintf(err_str, ERROR_STRING_SIZE,
++					"%s is not formatted with z/OS compatible "
++					"disk layout!", options.device);
++				fdasd_error(anc, wrong_disk_format, err_str);
++			}
+ 		}
+ 
+ 		if (anc->verbose) printf("disk layout check   : ok\n");
+-- 
+1.7.7.6
+
diff --git a/s390utils.spec b/s390utils.spec
index ab224cc..210c698 100644
--- a/s390utils.spec
+++ b/s390utils.spec
@@ -7,8 +7,8 @@
 Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
-Version:        1.19.0
-Release:        4%{?dist}
+Version:        1.20.0
+Release:        1%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 ExclusiveArch:  s390 s390x
@@ -38,7 +38,7 @@ Source18:       cpuplugd.initd
 Source19:       mon_statd.initd
 Source21:       normalize_dasd_arg
 
-Patch1:         s390-tools-1.19.0-fedora.patch
+Patch1:         s390-tools-1.20.0-fedora.patch
 
 Patch1000:      cmsfs-1.1.8-warnings.patch
 Patch1001:      cmsfs-1.1.8-kernel26.patch
@@ -858,6 +858,9 @@ User-space development files for the s390/s390x architecture.
 
 
 %changelog
+* Wed Dec 19 2012 Dan Horák <dan[at]danny.cz> - 2:1.20.0-1
+- updated to 1.20.0 (#804774)
+
 * Thu Nov 22 2012 Dan Horák <dan[at]danny.cz> - 2:1.19.0-4
 - clean BuildRequires a bit
 
diff --git a/sources b/sources
index fa482d5..f759467 100644
--- a/sources
+++ b/sources
@@ -2,3 +2,4 @@
 ecf3ff0ac4469db7297ebd6f7607fb48  lib-zfcp-hbaapi-2.1.tar.gz
 ba42772e5b305b5e147344442cd70826  src_vipa-2.0.4.tar.gz
 db032922754fb268f21ccdbc7621d19f  s390-tools-1.19.0.tar.bz2
+881237b31201d46ba452fa4ff51c934c  s390-tools-1.20.0.tar.bz2