diff --git a/.s390utils.metadata b/.s390utils.metadata new file mode 100644 index 0000000..601946b --- /dev/null +++ b/.s390utils.metadata @@ -0,0 +1 @@ +e10ffbde7f3fcf4438fdfdd83051ad68518e7be5 s390-tools-2.29.0.tar.gz diff --git a/s390utils.spec b/s390utils.spec index 17c92be..b004d71 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -15,7 +15,7 @@ Name: s390utils Summary: Utilities and daemons for IBM z Systems Version: 2.29.0 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 2 License: MIT URL: https://github.com/ibm-s390-linux/s390-tools @@ -63,6 +63,11 @@ Requires: s390utils-cpuplugd = %{epoch}:%{version}-%{release} Requires: s390utils-mon_statd = %{epoch}:%{version}-%{release} Requires: s390utils-iucvterm = %{epoch}:%{version}-%{release} Requires: s390utils-ziomon = %{epoch}:%{version}-%{release} +%else +# +# multiarch package structure +# +Requires: s390utils-se-data = %{epoch}:%{version}-%{release} %endif BuildRequires: make @@ -386,6 +391,7 @@ Requires: ethtool Requires: tar Requires: file Requires: s390utils-core = %{epoch}:%{version}-%{release} +Requires: s390utils-se-data = %{epoch}:%{version}-%{release} %{?systemd_requires} BuildRequires: perl-generators BuildRequires: ncurses-devel @@ -687,7 +693,6 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm %{_mandir}/man8/znetconf.8* %{_mandir}/man8/zpcictl.8* %dir %{_datadir}/s390-tools -%{_datadir}/s390-tools/genprotimg/ %{_datadir}/s390-tools/netboot/ %dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey %dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey/kmip @@ -699,6 +704,18 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm # Additional Fedora/RHEL specific stuff /boot/tape0 +%package se-data +License: MIT +Summary: Data for Secure Execution +BuildArch: noarch + +%description se-data +%{summary}. + +%files se-data +%dir %{_datadir}/s390-tools +%{_datadir}/s390-tools/genprotimg/ + # # *********************** s390-tools osasnmpd package *********************** # @@ -1042,6 +1059,10 @@ User-space development files for the s390/s390x architecture. %changelog +* Mon Jan 29 2024 Dan Horák - 2:2.29.0-3 +- add s390utils-se-data as a noarch subpackage with Secure Execution data files +- Resolves: RHEL-10567 + * Fri Jan 19 2024 Dan Horák - 2:2.29.0-2 - SE: Secure guest tool to bind and associate APQNs (RHEL-10574) - Resolves: RHEL-10574