From 10e926ee962a788633b8d554c4773d8f041a3096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Mon, 10 Jul 2017 15:00:17 +0200
Subject: [PATCH] - removed chmem/lsmem as they are now provided by util-linux
 >= 2.30 (#1468446)

---
 s390utils.spec | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/s390utils.spec b/s390utils.spec
index 5d53e66..2ad0eae 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.36.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 ExclusiveArch:  s390 s390x
@@ -197,8 +197,6 @@ Requires:       perl gawk sed coreutils
 Requires:       sysfsutils
 Requires:       sg3_utils
 Requires:       ethtool
-# lsmem/chmem
-Requires:       perl(Getopt::Long)
 
 Requires(pre):   chkconfig
 Requires(preun): chkconfig
@@ -311,9 +309,6 @@ s390 base tools. This collection provides the following utilities:
                    adapters.
      - cio_ignore: Query and modify the contents of the CIO device driver
                    blacklist.
-     - lsmem:      Display the online status of the available memory.
-     - chmem:      Set hotplug memory online or offline.
-
    * dumpconf:
      Allows to configure the dump device used for system dump in case a kernel
      panic occurs. This tool can also be used as an init script for etc/init.d.
@@ -389,11 +384,11 @@ fi
 %{_sbindir}/dbginfo.sh
 %{_bindir}/lscpumf
 %{_sbindir}/lsluns
-%{_sbindir}/lsmem
+%exclude %{_sbindir}/lsmem
 %{_sbindir}/lsreipl
 %{_sbindir}/lsshut
 %{_sbindir}/chcpumf
-%{_sbindir}/chmem
+%exclude %{_sbindir}/chmem
 %{_sbindir}/chreipl
 %{_sbindir}/chshut
 %{_sbindir}/ip_watcher.pl
@@ -415,7 +410,7 @@ fi
 %{_mandir}/man8/chccwdev.8*
 %{_mandir}/man8/chchp.8*
 %{_mandir}/man8/chcpumf.8*
-%{_mandir}/man8/chmem.8*
+%exclude %{_mandir}/man8/chmem.8*
 %{_mandir}/man8/chreipl.8*
 %{_mandir}/man8/chshut.8*
 %{_mandir}/man8/chzcrypt.8*
@@ -431,7 +426,7 @@ fi
 %{_mandir}/man8/lschp.8*
 %{_mandir}/man8/lscss.8*
 %{_mandir}/man8/lsdasd.8*
-%{_mandir}/man8/lsmem.8*
+%exclude %{_mandir}/man8/lsmem.8*
 %{_mandir}/man8/lsluns.8*
 %{_mandir}/man8/lsqeth.8*
 %{_mandir}/man8/lsreipl.8*
@@ -812,6 +807,9 @@ User-space development files for the s390/s390x architecture.
 
 
 %changelog
+* Mon Jul 10 2017 Dan Horák <dan[at]danny.cz> - 2:1.36.1-3
+- removed chmem/lsmem as they are now provided by util-linux >= 2.30 (#1468446)
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2:1.36.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild