From 54cec27eb24c4129714a0a5e0b28ca1f8f05ab5fa8487e24756bc112029db504 Mon Sep 17 00:00:00 2001
From: Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
Date: Tue, 12 Mar 2024 09:22:28 +0000
Subject: [PATCH] Accepting request 1157136 from
 home:ngueorguiev:branches:Base:System

- Amended the .spec file for x86_64 (jsc#PED-7135, jsc#IBM-1309)

OBS-URL: https://build.opensuse.org/request/show/1157136
OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=197
---
 s390-tools.changes |  5 +++++
 s390-tools.spec    | 21 +++++++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/s390-tools.changes b/s390-tools.changes
index b9c2c0d..8197716 100644
--- a/s390-tools.changes
+++ b/s390-tools.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar 12 08:46:19 UTC 2024 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
+
+- Amended the .spec file for x86_64 (jsc#PED-7135, jsc#IBM-1309) 
+
 -------------------------------------------------------------------
 Wed Feb 21 17:02:55 UTC 2024 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
 
diff --git a/s390-tools.spec b/s390-tools.spec
index b9ec7c3..a964b3f 100644
--- a/s390-tools.spec
+++ b/s390-tools.spec
@@ -35,7 +35,7 @@
 Name:           s390-tools
 Version:        2.31.0
 Release:        0
-Summary:        S/390 tools like zipl and dasdfmt
+Summary:        S/390 tools like zipl and dasdfmt for s390x (plus selected tools for x86_64)
 License:        MIT
 Group:          System/Kernel
 URL:            https://github.com/ibm-s390-tools/s390-tools
@@ -205,13 +205,17 @@ Provides:       group(zkeyadm)
 ExclusiveArch:  s390x x86_64
 
 %description
-This package contains the tools needed to use Linux on IBM z Systems
+This package contains the tools (s390x, x86_64) needed to use Linux on IBM z Systems
 and exploit many of the various capabilities of the hardware or z/VM.
 For example:
+ - s390x
 dasdfmt  - low-level format tool for ECKD DASD
 fdasd	 - partitions ECKD DASDs with z/OS compatible disk layout
 zipl     - boot loader and dump DASD initializer
 zgetdump - tool to get linux system dumps from DASD
+ - x86_64
+genprotimg - create a protected virtualization image
+pvattest   - create, perform, and verify protected virtualization attestation measurements
 
 %package -n osasnmpd
 Summary:        OSA-Express SNMP subagent
@@ -342,7 +346,7 @@ tar -xzf %{SOURCE201}
 export OPT_FLAGS="%{optflags}"
 export KERNELIMAGE_MAKEFLAGS="%%{?_smp_mflags}"
 
-%make_build -v \
+%make_build \
      ZFCPDUMP_DIR=%{_prefix}/lib/s390-tools/zfcpdump \
      DISTRELEASE=%{release} \
      UDEVRUNDIR=/run/udev \
@@ -351,7 +355,7 @@ export KERNELIMAGE_MAKEFLAGS="%%{?_smp_mflags}"
      CC=gcc-13 \
      CXX=g++-13
 ###     all
-gcc-13 -v -static -o read_values ${OPT_FLAGS} %{SOURCE86} -lqc
+gcc-13 -static -o read_values ${OPT_FLAGS} %{SOURCE86} -lqc
 
 %install
 mkdir -p %{buildroot}/boot/zipl
@@ -784,14 +788,11 @@ export KERNELIMAGE_MAKEFLAGS="%%{?_smp_mflags}"
 
 %files
 %{_prefix}/bin/*
-%{_prefix}/share/s390-tools/*
-%dir /usr/share/s390-tools
+%dir %{_datadir}/s390-tools
+%dir %{_datadir}/s390-tools/genprotimg
+%{_datadir}/s390-tools/genprotimg/check_hostkeydoc
 %{_mandir}/man1/*
 
-%files debuginfo
-%dir %{_prefix}/lib/debug
-%dir %{_prefix}/lib/debug/usr/bin
-
 %endif
 
 %changelog