- rebased to 2.19.0 (#2022347)

- cmsfs-fuse Requires glibc-gconv-extra (#2022702)
- cpictl: fix permissions (#2024102)
- Resolves: #2022347 #2022702 #2024102

s390utils.spec

@@ -5,7 +5,7 @@
 
 Name:           s390utils
 Summary:        Utilities and daemons for IBM z Systems
-Version:        2.18.0
+Version:        2.19.0
 Release:        1%{?dist}
 Epoch:          2
 License:        MIT
@@ -34,7 +34,7 @@ Patch0:         s390-tools-zipl-invert-script-options.patch
 Patch1:         s390-tools-zipl-blscfg-rpm-nvr-sort.patch
 
 # backported fixes
-Patch100:       s390utils-2.18.0-rhel.patch
+Patch100:       s390utils-2.19.0-rhel.patch
 
 Requires:       s390utils-core = %{epoch}:%{version}-%{release}
 Requires:       s390utils-base = %{epoch}:%{version}-%{release}
@@ -70,9 +70,11 @@ find . -name Makefile | xargs sed -i 's/$(INSTALL) -s/$(INSTALL)/g'
 
 %build
 make \
-        CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" \
+        CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cxxflags}" LDFLAGS="%{build_ldflags}" \
+        HAVE_DRACUT=1 \
         NO_PIE_LDFLAGS="" \
         BINDIR=/usr/sbin \
+        UDEVRUNDIR=/run/udev \
         DISTRELEASE=%{release} \
         V=1
 
@@ -83,6 +85,7 @@ make install \
         DESTDIR=%{buildroot} \
         BINDIR=/usr/sbin \
         SYSTEMDSYSTEMUNITDIR=%{_unitdir} \
+        UDEVRUNDIR=/run/udev \
         DISTRELEASE=%{release} \
         V=1
 
@@ -146,6 +149,10 @@ install -p -m 644 %{SOURCE17} %{buildroot}%{_udevrulesdir}/81-ccw.rules
 # zipl.conf to be ghosted
 touch %{buildroot}%{_sysconfdir}/zipl.conf
 
+# fixups
+# https://bugzilla.redhat.com/show_bug.cgi?id=2024102
+chmod 755 %{buildroot}/lib/s390-tools/cpictl
+
 
 %files
 %doc README.md
@@ -732,6 +739,7 @@ fi
 Summary:        CMS file system based on FUSE
 BuildRequires:  fuse-devel
 Requires:       fuse
+Requires:       glibc-gconv-extra
 Obsoletes:      %{name}-cmsfs < 2:2.7.0-3
 
 %description cmsfs-fuse
@@ -811,6 +819,42 @@ getent group cpacfstats >/dev/null || groupadd -r cpacfstats
 %{_mandir}/man8/cpacfstatsd.8*
 %{_unitdir}/cpacfstatsd.service
 
+#
+# *********************** chreipl-fcp-mpath package  ***********************
+#
+%package chreipl-fcp-mpath
+Summary:          Use multipath information for re-IPL path failover
+BuildRequires:    make
+BuildRequires:    bash
+BuildRequires:    coreutils
+BuildRequires:    gawk
+BuildRequires:    gzip
+BuildRequires:    sed
+Requires:         bash
+Requires:         coreutils
+Requires:         util-linux
+Requires:         systemd-udev
+Requires:         device-mapper-multipath
+Requires:         dracut
+
+%description chreipl-fcp-mpath
+The chreipl-fcp-mpath toolset monitors udev events about paths to the re-IPL
+volume. If the currently configured FCP re-IPL path becomes unavailable, the
+toolset checks for operational paths to the same volume. If available, it
+reconfigures the FCP re-IPL settings to use an operational path.
+
+%files chreipl-fcp-mpath
+%doc chreipl-fcp-mpath/README.md
+%dir %{_prefix}/lib/chreipl-fcp-mpath/
+%{_prefix}/lib/chreipl-fcp-mpath/*
+%{_prefix}/lib/dracut/dracut.conf.d/70-chreipl-fcp-mpath.conf
+%{_prefix}/lib/udev/chreipl-fcp-mpath-is-ipl-tgt
+%{_prefix}/lib/udev/chreipl-fcp-mpath-is-ipl-vol
+%{_prefix}/lib/udev/chreipl-fcp-mpath-is-reipl-zfcp
+%{_prefix}/lib/udev/chreipl-fcp-mpath-record-volume-identifier
+%{_prefix}/lib/udev/chreipl-fcp-mpath-try-change-ipl-path
+%{_udevrulesdir}/70-chreipl-fcp-mpath.rules
+
 #
 # *********************** devel package  ***********************
 #
@@ -831,6 +875,12 @@ User-space development files for the s390/s390x architecture.
 
 
 %changelog
+* Thu Nov 18 2021 Dan Horák <dan[at]danny.cz> - 2:2.19.0-1
+- rebased to 2.19.0 (#2022347)
+- cmsfs-fuse Requires glibc-gconv-extra (#2022702)
+- cpictl: fix permissions (#2024102)
+- Resolves: #2022347 #2022702 #2024102
+
 * Fri Nov 05 2021 Dan Horák <dan[at]danny.cz> - 2:2.18.0-1
 - move vmcp to core (#1931287)
 - rebased to 2.18.0 (#2011434)

sources

@@ -1 +1 @@
-SHA512 (s390-tools-2.18.0.tar.gz) = 498cbc55d7d84f72e9ec0f625267a26377a80f7be3bd967ec380531b6430d5ea0a192d92024ccd1f70acfe4a1c5aeaa9004110a158830972ca0a0204e7b9d328
+SHA512 (s390-tools-2.19.0.tar.gz) = 16c67d74e657e3c7653c7618bfcd80625991f6cc748d8c5863a891ce6148397439e2fb245d424c470d929be57baf99433f733df12db9c6eb080e746ef5ac8079