Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package s390-tools for openSUSE:Factory checked in at 2023-01-12 22:44:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/s390-tools (Old) and /work/SRC/openSUSE:Factory/.s390-tools.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "s390-tools" Thu Jan 12 22:44:36 2023 rev:51 rq:1057829 version:2.25.0 Changes: -------- --- /work/SRC/openSUSE:Factory/s390-tools/s390-tools.changes 2023-01-11 14:37:20.278005401 +0100 +++ /work/SRC/openSUSE:Factory/.s390-tools.new.32243/s390-tools.changes 2023-01-12 22:44:36.884973234 +0100 @@ -1,0 +2,6 @@ +Wed Jan 11 15:39:38 UTC 2023 - Nikolay Gueorguiev <[email protected]> + +- Updated read_values.c for z16 machine type (bsc#1206832) + * Added the IBM LinuxONE Emperor 4 machine type + +------------------------------------------------------------------- @@ -4,0 +11,5 @@ + +------------------------------------------------------------------- +Tue Dec 27 13:19:41 UTC 2022 - Ludwig Nussel <[email protected]> + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ s390-tools.spec ++++++ --- /var/tmp/diff_new_pack.Xslg0k/_old 2023-01-12 22:44:39.316986886 +0100 +++ /var/tmp/diff_new_pack.Xslg0k/_new 2023-01-12 22:44:39.320986908 +0100 @@ -1,7 +1,7 @@ # # spec file for package s390-tools # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2001-2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ %define _modprobedir /lib/modprobe.d %endif %global modprobe_d_files 90-s390-tools.conf -%if 0%{?usrmerged} +%if 0%{?suse_version} >= 1550 %define _mysbindir %{_sbindir} %else %define _mysbindir /sbin @@ -49,7 +49,7 @@ Source7: appldata Source8: sysconfig.appldata Source10: dasdro -%if 0%{?usrmerged} +%if 0%{?suse_version} >= 1550 Source11: dasd_reload.opensuse Source12: mkdump.pl.opensuse %else @@ -62,13 +62,13 @@ Source18: zpxe.rexx Source19: rules.xpram Source20: rules.hw_random -%if 0%{?usrmerged} +%if 0%{?suse_version} >= 1550 Source21: 59-graf.rules.opensuse %else Source21: 59-graf.rules.suse %endif Source22: s390-tools-zdsfs.caution.txt -%if 0%{?usrmerged} +%if 0%{?suse_version} >= 1550 Source23: README.SUSE.opensuse %else Source23: README.SUSE.suse @@ -80,7 +80,7 @@ Source28: 59-prng.rules Source29: 59-zfcp-compat.rules Source30: 90-s390-tools.conf -%if 0%{?usrmerged} +%if 0%{?suse_version} >= 1550 Source31: detach_disks.sh.opensuse Source32: killcdl.opensuse %else @@ -90,14 +90,14 @@ Source33: lgr_check Source34: sysconfig.virtsetup Source35: virtsetup.service -%if 0%{?usrmerged} +%if 0%{?suse_version} >= 1550 Source36: virtsetup.sh.opensuse %else Source36: virtsetup.sh.suse %endif Source37: appldata.service Source38: hsnc.service -%if 0%{?usrmerged} +%if 0%{?suse_version} >= 1550 Source39: vmlogrdr.service.opensuse %else Source39: vmlogrdr.service.suse @@ -110,7 +110,7 @@ Source86: read_values.c Source87: read_values.8 Source88: ctc_configure -%if 0%{?usrmerged} +%if 0%{?suse_version} >= 1550 Source89: dasd_configure.opensuse Source90: iucv_configure.opensuse %else @@ -134,7 +134,7 @@ Patch900: s390-tools-sles12-zipl_boot_msg.patch Patch901: s390-tools-sles15-sysconfig-compatible-dumpconf.patch Patch902: s390-tools-sles12-create-filesystem-links.patch -%if 0%{?usrmerged} +%if 0%{?suse_version} >= 1550 Patch903: s390-tools-sles12-update-by_id-links-on-change-and-add-action.patch.opensuse %else Patch903: s390-tools-sles12-update-by_id-links-on-change-and-add-action.patch.suse @@ -347,7 +347,7 @@ # The "usrmerge" has happened in openSUSE:Factory, but not yet in SLES. # Make sure we look for the zfcpdump kernel image in the right place. -%if 0%{?usrmerged} +%if 0%{?suse_version} >= 1550 install -D -m600 %{_prefix}/lib/modules/*-zfcpdump/image %{buildroot}%{_prefix}/lib/s390-tools/zfcpdump/zfcpdump-image %else install -D -m600 /boot/image-*-zfcpdump %{buildroot}%{_prefix}/lib/s390-tools/zfcpdump/zfcpdump-image @@ -425,7 +425,7 @@ # If building for openSUSE, move all the binaries installed via # the IBM-provided Makefile from /sbin to /usr/sbin/ to # align with the openSUSE "usrmerge" project -%if 0%{?usrmerged} +%if 0%{?suse_version} >= 1550 mv -vi %{buildroot}/sbin/* %{buildroot}%{_mysbindir}/ %endif ++++++ read_values.c ++++++ --- /var/tmp/diff_new_pack.Xslg0k/_old 2023-01-12 22:44:39.732989221 +0100 +++ /var/tmp/diff_new_pack.Xslg0k/_new 2023-01-12 22:44:39.736989243 +0100 @@ -76,7 +76,8 @@ { QC_TYPE_FAMILY_LINUXONE, "8561", "8561 = IBM LinuxONE III LT1" }, { QC_TYPE_FAMILY_IBMZ, "8562", "8562 = z15 T02 IBM z15 T02" }, { QC_TYPE_FAMILY_LINUXONE, "8562", "8562 = IBM LinuxONE III LT2" }, - { QC_TYPE_FAMILY_IBMZ, "3931", "3931 = z16 IBM z16" }, + { QC_TYPE_FAMILY_IBMZ, "3931", "3931 = z16 IBM z16 A01" }, + { QC_TYPE_FAMILY_LINUXONE, "3931", "3931 = IBM LinuxONE Emperor 4" }, }; int debug = 0;
