From 2136cc04f36a9b30c71bcce65e2e60f1c02c471a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Thu, 7 Dec 2017 21:08:30 +0100
Subject: [PATCH] - rebased to 2.2.0

---
 .gitignore     |  1 +
 s390utils.spec | 11 ++++-------
 sources        |  1 +
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index bcfd193..c6c1eb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ src_vipa-2.0.4.tar.gz
 /s390-tools-*.tar.bz2
 /s390-tools-2.0.0.tar.gz
 /s390-tools-2.1.0.tar.gz
+/s390-tools-2.2.0.tar.gz
diff --git a/s390utils.spec b/s390utils.spec
index 3185837..3c6b597 100644
--- a/s390utils.spec
+++ b/s390utils.spec
@@ -4,7 +4,7 @@
 Name:           s390utils
 Summary:        Utilities and daemons for IBM z Systems
 Group:          System Environment/Base
-Version:        2.1.0
+Version:        2.2.0
 Release:        1%{?dist}
 Epoch:          2
 License:        MIT
@@ -381,9 +381,6 @@ For more information refer to the following publications:
 %{_sbindir}/zipl
 %{_sbindir}/znetconf
 %{_bindir}/lscpumf
-# provided by util-linux
-%exclude %{_sbindir}/lsmem
-%exclude %{_sbindir}/chmem
 %{_bindir}/dump2tar
 %{_bindir}/vmconvert
 %{_bindir}/zkey
@@ -440,9 +437,6 @@ For more information refer to the following publications:
 %{_mandir}/man8/zgetdump.8*
 %{_mandir}/man8/znetconf.8*
 %{_mandir}/man8/zipl.8*
-# provided by util-linux
-%exclude %{_mandir}/man8/chmem.8*
-%exclude %{_mandir}/man8/lsmem.8*
 %dir %{_datadir}/s390-tools/
 %{_datadir}/s390-tools/cpumf/
 %{_datadir}/s390-tools/netboot/
@@ -791,6 +785,9 @@ User-space development files for the s390/s390x architecture.
 
 
 %changelog
+* Thu Dec 07 2017 Dan Horák <dan[at]danny.cz> - 2:2.2.0-1
+- rebased to 2.2.0
+
 * Mon Sep 25 2017 Dan Horák <dan[at]danny.cz> - 2:2.1.0-1
 - rebased to 2.1.0
 
diff --git a/sources b/sources
index 1ad65b4..0db100c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 SHA512 (cmsfs-1.1.8c.tar.gz) = 2ba5687d378fdd9871283728e81f1399047e74f9bba3936726eda11a978fe6ced1a300f15acb871d5daa26e61069d89767c753cf584f2731f5e99985db96aef0
 SHA512 (src_vipa-2.1.0.tar.gz) = 8f6048e82b4bcc479dfb09d62da64b9519f66efc31889ff795ee6ca107e262167df57628c305f1b899c41bb3f035e6309552d8548c890855d319e8e60d6a6cf7
 SHA512 (s390-tools-2.1.0.tar.gz) = a1e2f7cda8a16f9ea3c5e7bfe118dd8044542b4fee7086a3656fc985f64170e29884177004265e9f0802c45fa04057edf665feccebeb38dc0f5515093ccf31aa
+SHA512 (s390-tools-2.2.0.tar.gz) = f029b92f18f95b49e189a4f5ad78c02ee629e630a93a8bbfe6966030fe8aaf069e86582d77213d68b447300b73317e4dbcb228df5ff0795a2785f6735087ceab