From 67610904441c9a9718fd074dd68acb7d93f3deeaabfbfecf622eea60926bac60 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 3 Feb 2019 18:25:11 +0000 Subject: [PATCH 1/7] Accepting request 670592 from home:michals:s390 OBS-URL: https://build.opensuse.org/request/show/670592 OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=73 --- s390-tools.changes | 5 +++++ s390-tools.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/s390-tools.changes b/s390-tools.changes index addb276..8195193 100644 --- a/s390-tools.changes +++ b/s390-tools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 30 19:40:36 UTC 2019 - Michal Suchanek + +- Require cpacfstats group (bsc#1123730). + ------------------------------------------------------------------- Mon Jan 28 17:38:15 UTC 2019 - mpost@suse.com diff --git a/s390-tools.spec b/s390-tools.spec index 3f63bce..5bda2ac 100644 --- a/s390-tools.spec +++ b/s390-tools.spec @@ -206,6 +206,7 @@ BuildRequires: zlib-devel-static # Don't build with pie to avoid problems with zipl #!BuildIgnore: gcc-PIE PreReq: shadow %fillup_prereq dracut permissions +Requires(pre): group(cpacfstats) Requires: coreutils Requires: gawk Requires: perl-base From f7fd7756203e7e99ca38e2fc704b16704ecb911c9ad45bb5e4527eb3db3e20a0 Mon Sep 17 00:00:00 2001 From: Mark Post Date: Fri, 15 Feb 2019 00:37:21 +0000 Subject: [PATCH 2/7] Accepting request 676267 from home:markkp:branches:Base:System - Reverted the previous change to use the "new and shiny" system RPM method of adding groups that doesn't apply to this package. - Modified the spec file to add a group named cpacfstats (bsc#1123730) OBS-URL: https://build.opensuse.org/request/show/676267 OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=74 --- s390-tools.changes | 5 +++-- s390-tools.spec | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/s390-tools.changes b/s390-tools.changes index 8195193..c8e1917 100644 --- a/s390-tools.changes +++ b/s390-tools.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- -Wed Jan 30 19:40:36 UTC 2019 - Michal Suchanek +Thu Feb 14 23:53:57 UTC 2019 - mpost@suse.com -- Require cpacfstats group (bsc#1123730). +- Modified the spec file to add a group named cpacfstats + (bsc#1123730) ------------------------------------------------------------------- Mon Jan 28 17:38:15 UTC 2019 - mpost@suse.com diff --git a/s390-tools.spec b/s390-tools.spec index 5bda2ac..5e848c7 100644 --- a/s390-tools.spec +++ b/s390-tools.spec @@ -206,7 +206,6 @@ BuildRequires: zlib-devel-static # Don't build with pie to avoid problems with zipl #!BuildIgnore: gcc-PIE PreReq: shadow %fillup_prereq dracut permissions -Requires(pre): group(cpacfstats) Requires: coreutils Requires: gawk Requires: perl-base @@ -518,6 +517,8 @@ chmod 755 osasnmpd getent group ts-shell >/dev/null 2>&1 || groupadd -r ts-shell # check for zkeyadm group or create it getent group zkeyadm >/dev/null 2>&1 || groupadd -r zkeyadm +# check for cpacfstats group or create it +getent group cpacfstats >/dev/null 2>&1 2>&1 || groupadd -r cpacfstats %service_add_pre appldata.service %service_add_pre cio_ignore.service %service_add_pre cpacfstatsd.service From b76a19aa363cea236eb155fb889dfc7f6190092c61868c3eafa313f15a995b1d Mon Sep 17 00:00:00 2001 From: Mark Post Date: Fri, 15 Feb 2019 09:32:09 +0000 Subject: [PATCH 3/7] OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=75 --- s390-tools.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/s390-tools.spec b/s390-tools.spec index 5e848c7..646b9bf 100644 --- a/s390-tools.spec +++ b/s390-tools.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -27,7 +27,7 @@ Release: 0 Summary: S/390 tools like zipl and dasdfmt License: MIT Group: System/Kernel -URL: https://github.com/ibm-s390-tools/s390-tools +Url: https://github.com/ibm-s390-tools/s390-tools Source: s390-tools-%{version}.tar.gz Source1: s390-tools-rpmlintrc Source2: zipl.conf @@ -518,7 +518,7 @@ getent group ts-shell >/dev/null 2>&1 || groupadd -r ts-shell # check for zkeyadm group or create it getent group zkeyadm >/dev/null 2>&1 || groupadd -r zkeyadm # check for cpacfstats group or create it -getent group cpacfstats >/dev/null 2>&1 2>&1 || groupadd -r cpacfstats +getent group cpacfstats >/dev/null 2>&1 || groupadd -r cpacfstats %service_add_pre appldata.service %service_add_pre cio_ignore.service %service_add_pre cpacfstatsd.service From 0ab3f07ba369a62ae21c6a2da1ba5eb900a30157a2b8447e5f44e30570912850 Mon Sep 17 00:00:00 2001 From: Mark Post Date: Fri, 15 Feb 2019 09:32:36 +0000 Subject: [PATCH 4/7] OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=76 --- s390-tools.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/s390-tools.spec b/s390-tools.spec index 646b9bf..6370fe3 100644 --- a/s390-tools.spec +++ b/s390-tools.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -27,7 +27,7 @@ Release: 0 Summary: S/390 tools like zipl and dasdfmt License: MIT Group: System/Kernel -Url: https://github.com/ibm-s390-tools/s390-tools +URL: https://github.com/ibm-s390-tools/s390-tools Source: s390-tools-%{version}.tar.gz Source1: s390-tools-rpmlintrc Source2: zipl.conf From 8b3799a6c8e78b6c2f4eac19925ae5b497a1fd635704a12eacf5d40f7491c4be Mon Sep 17 00:00:00 2001 From: Mark Post Date: Thu, 21 Feb 2019 20:22:30 +0000 Subject: [PATCH 5/7] Accepting request 678085 from home:markkp:branches:Base:System - Now that IBM has the package on github, use a full source URL. - Change Pre-Req to Requires(pre) and (post), and remove dracut. - Institute the %autosetup macro. - Remove erroneous %dir entry for %_unitdir - Change bash-specific "==" tests in scriptlets with a more generic "=". OBS-URL: https://build.opensuse.org/request/show/678085 OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=77 --- s390-tools.changes | 10 ++++ s390-tools.spec | 116 +++------------------------------------------ 2 files changed, 16 insertions(+), 110 deletions(-) diff --git a/s390-tools.changes b/s390-tools.changes index c8e1917..2a6454a 100644 --- a/s390-tools.changes +++ b/s390-tools.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Feb 21 19:38:18 UTC 2019 - mpost@suse.com + +- Now that IBM has the package on github, use a full source URL. +- Change Pre-Req to Requires(pre) and (post), and remove dracut. +- Institute the %autosetup macro. +- Remove erroneous %dir entry for %_unitdir +- Change bash-specific "==" tests in scriptlets with a more + generic "=". + ------------------------------------------------------------------- Thu Feb 14 23:53:57 UTC 2019 - mpost@suse.com diff --git a/s390-tools.spec b/s390-tools.spec index 6370fe3..324e201 100644 --- a/s390-tools.spec +++ b/s390-tools.spec @@ -28,7 +28,7 @@ Summary: S/390 tools like zipl and dasdfmt License: MIT Group: System/Kernel URL: https://github.com/ibm-s390-tools/s390-tools -Source: s390-tools-%{version}.tar.gz +Source: https://github.com/ibm-s390-tools/s390-tools/archive/v%{version}.tar.gz#/s390-tools-%{version}.tar.gz Source1: s390-tools-rpmlintrc Source2: zipl.conf Source3: hsnc @@ -205,7 +205,8 @@ BuildRequires: tcpd-devel BuildRequires: zlib-devel-static # Don't build with pie to avoid problems with zipl #!BuildIgnore: gcc-PIE -PreReq: shadow %fillup_prereq dracut permissions +Requires(pre): shadow +Requires(post): %fillup_prereq permissions Requires: coreutils Requires: gawk Requires: perl-base @@ -266,111 +267,7 @@ This package contains a HMC drive file system based on FUSE and a tool to list files and directories. %prep -%setup -q - -# SUSE patches -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 -%patch28 -p1 -%patch29 -p1 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -p1 -%patch35 -p1 -%patch36 -p1 -%patch37 -p1 -%patch38 -p1 -%patch39 -p1 -%patch40 -p1 -%patch41 -p1 -%patch42 -p1 -%patch43 -p1 -%patch44 -p1 -%patch45 -p1 -%patch46 -p1 -%patch47 -p1 -%patch48 -p1 -%patch49 -p1 -%patch50 -p1 -%patch51 -p1 -%patch52 -p1 -%patch53 -p1 -%patch54 -p1 -%patch55 -p1 -%patch56 -p1 -%patch57 -p1 -%patch58 -p1 -%patch59 -p1 -%patch60 -p1 -%patch61 -p1 -%patch62 -p1 -%patch63 -p1 -%patch64 -p1 -%patch65 -p1 -%patch66 -p1 -%patch67 -p1 -%patch68 -p1 -%patch69 -p1 -%patch70 -p1 -%patch71 -p1 -%patch72 -p1 -%patch73 -p1 -%patch74 -p1 -%patch75 -p1 -%patch76 -p1 -%patch77 -p1 -%patch78 -p1 -%patch79 -p1 -%patch80 -p1 -%patch81 -p1 -%patch82 -p1 -%patch83 -p1 -%patch84 -p1 -%patch85 -p1 -%patch86 -p1 -%patch87 -p1 -%patch88 -p1 -%patch89 -p1 -%patch90 -p1 -%patch91 -p1 -%patch92 -p1 -%patch93 -p1 -%patch94 -p1 -%patch95 -p1 -%patch96 -p1 -%patch97 -p1 -%patch98 -p1 -%patch99 -p1 -%patch100 -p1 -%patch101 -p1 -%patch102 -p1 +%autosetup -p1 cp -vi %{SOURCE22} CAUTION @@ -534,7 +431,7 @@ getent group cpacfstats >/dev/null 2>&1 || groupadd -r cpacfstats %post read INITPGM < /proc/1/comm -if [ "${INITPGM}" == "systemd" ]; then +if [ "${INITPGM}" = "systemd" ]; then echo "Running systemctl daemon-reload." systemctl daemon-reload fi @@ -607,7 +504,7 @@ grep -q '^%{_bindir}/ts-shell$' %{_sysconfdir}/shells \ # run it, so we have to make sure we can safely issue the # systemctl command. read INITPGM < /proc/1/comm -if [ "${INITPGM}" == "systemd" ]; then +if [ "${INITPGM}" = "systemd" ]; then echo "Running systemctl daemon-reload." systemctl daemon-reload fi @@ -657,7 +554,6 @@ fi %dir %{_prefix}/lib/s390-tools/zfcpdump %dir %{_prefix}/lib/udev/rules.d %dir %{_prefix}/lib/systemd/scripts -%dir %{_unitdir} %dir %{_datadir}/s390-tools %dir %{_datadir}/s390-tools/cpumf %dir %{_datadir}/s390-tools/netboot From abab0f43510429e1eaa7f0231c3545df9ef59f987e073309ed2ac71d927cc4ff Mon Sep 17 00:00:00 2001 From: Mark Post Date: Thu, 21 Feb 2019 21:13:40 +0000 Subject: [PATCH 6/7] OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=78 --- s390-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s390-tools.spec b/s390-tools.spec index 324e201..082984f 100644 --- a/s390-tools.spec +++ b/s390-tools.spec @@ -259,7 +259,7 @@ represented as a file in that directory. %package hmcdrvfs Summary: HMC drive file system based on FUSE License: GPL-2.0-only -Group: System/Base +Group: System/Filesystems Requires: fuse %description hmcdrvfs From df32ae2dc86065fe5cdba97853c005655aa45e4d4e38ce438feffebb1a59b1f4 Mon Sep 17 00:00:00 2001 From: Mark Post Date: Thu, 21 Feb 2019 21:14:33 +0000 Subject: [PATCH 7/7] OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=79 --- s390-tools.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/s390-tools.changes b/s390-tools.changes index 2a6454a..48e833b 100644 --- a/s390-tools.changes +++ b/s390-tools.changes @@ -3,6 +3,8 @@ Thu Feb 21 19:38:18 UTC 2019 - mpost@suse.com - Now that IBM has the package on github, use a full source URL. - Change Pre-Req to Requires(pre) and (post), and remove dracut. +- Changed the group for the hmcdrvfs package from Base:System to + Base/Filesystems - Institute the %autosetup macro. - Remove erroneous %dir entry for %_unitdir - Change bash-specific "==" tests in scriptlets with a more