From d9456cfc0f5e08051ae698ae352f265911255e395c8c5fdc6ffec487fac88962 Mon Sep 17 00:00:00 2001 From: Mark Post Date: Thu, 7 Sep 2017 19:52:06 +0000 Subject: [PATCH] - Remove lsmem and chmem and their manpages from the package, both tools have been added to util-linux-2.30 OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=17 --- s390-tools.changes | 6 ++++++ s390-tools.spec | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/s390-tools.changes b/s390-tools.changes index 4d6d907..e6fabeb 100644 --- a/s390-tools.changes +++ b/s390-tools.changes @@ -10,6 +10,12 @@ Wed Jul 12 18:14:13 UTC 2017 - mpost@suse.com - Added s390-tools-sles12sp3-chmem-try-to-online-zone-movable.patch (bsc#1048363). +------------------------------------------------------------------- +Mon Jul 3 17:29:19 CEST 2017 - ro@suse.de + +- Remove lsmem and chmem and their manpages from the package, + both tools have been added to util-linux-2.30 + ------------------------------------------------------------------- Wed May 31 21:26:50 UTC 2017 - mpost@suse.com diff --git a/s390-tools.spec b/s390-tools.spec index a6a494f..5d7cb49 100644 --- a/s390-tools.spec +++ b/s390-tools.spec @@ -327,6 +327,12 @@ install -m755 -t sbin/ %{S:88} %{S:89} %{S:90} %{S:91} %{S:92} %{S:93} install -m644 -t $RPM_BUILD_ROOT/%{_mandir}/man8 %{S:94} %{S:95} %{S:96} %{S:97} %{S:98} %{S:99} ### +### lsmem/chmem have been added to util-linux +rm -fv $RPM_BUILD_ROOT/%{_mandir}/man8/lsmem.8* +rm -fv $RPM_BUILD_ROOT/%{_mandir}/man8/chmem.8* +rm -fv $RPM_BUILD_ROOT/%{_sbindir}/lsmem +rm -fv $RPM_BUILD_ROOT/%{_sbindir}/chmem + find . ! -type d | %__sed 's/^.//;\-/man/-s/^.*$/%doc &.gz/' > %{_builddir}/%{name}-filelist grep -v -E 'osasnmp|*\.conf$' %{_builddir}/%{name}-filelist >%{_builddir}/%{name}.list