From a7b911f7cf057e955e6395cc2db18e62915b5980092f76e87d5e1f0f58c75722 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <sbrabec@suse.com>
Date: Tue, 7 May 2024 08:28:01 +0000
Subject: [PATCH] Accepting request 1172372 from
 home:sbrabec:branches:util-linux-sub

- Don't delete binaries not common for all architectures. Create an
  util-linux-extra subpackage instead, so users of third party
  tools can use them. (bsc#1222285)

OBS-URL: https://build.opensuse.org/request/show/1172372
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=561
---
 util-linux.changes |  7 +++++
 util-linux.spec    | 65 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+)

diff --git a/util-linux.changes b/util-linux.changes
index 5bca087..6f810cf 100644
--- a/util-linux.changes
+++ b/util-linux.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon May  6 17:09:08 UTC 2024 - Stanislav Brabec <sbrabec@suse.com>
+
+- Don't delete binaries not common for all architectures. Create an
+  util-linux-extra subpackage instead, so users of third party
+  tools can use them. (bsc#1222285)
+
 -------------------------------------------------------------------
 Mon Apr 15 13:27:41 UTC 2024 - Stefan Schubert <schubi@suse.com>
 
diff --git a/util-linux.spec b/util-linux.spec
index 347fc06..8dc0164 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -225,6 +225,18 @@ mount program, the fdisk configuration tool, and more.
 # Core packages #
 #################
 %if "%ulsubset" == "core"
+%ifarch s390 s390x ia64 m68k sparc
+%package -n util-linux-extra
+Summary:        A collection of basic system utilities - extra utilities
+License:        GPL-2.0-or-later
+Group:          System/Base
+
+%description -n util-linux-extra
+This package contains an util-linux tools that have no real use on a
+particular platform. It contains programs that are not well usable for the
+platform, but they can be required by scripts or third party tools.
+%endif
+
 %package -n libblkid1
 Summary:        Filesystem detection library
 License:        LGPL-2.1-or-later
@@ -613,6 +625,7 @@ chmod 755 %{buildroot}%{_sbindir}/flushb
 
 # arch dependent
 
+%if "%ulsubset" != "core"
 %ifarch s390 s390x
 rm -f %{buildroot}%{_sysconfdir}/fdprm
 rm -f %{buildroot}%{_bindir}/setterm
@@ -638,6 +651,8 @@ rm -f %{buildroot}%{_sbindir}/fdisk
 rm -f %{buildroot}%{_mandir}/man8/fdisk.8*
 %endif
 # arch ia64 m68k
+%endif
+# ulsubset != core
 
 # create list of setarch(8) symlinks
 find  %{buildroot}%{_mandir}/man8 -regextype posix-egrep  \
@@ -1568,6 +1583,56 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 # Core packages files #
 #######################
 %if "%ulsubset" == "core"
+%ifarch s390 s390x ia64 m68k sparc
+%files -n util-linux-extra
+#
+# Files not common for all architectures
+%ifarch ia64 m68k
+
+%if %{ul_extra_bin_sbin}
+%core /sbin/fdisk
+%endif
+# ul_extra_bin_sbin
+
+%core %{_sbindir}/fdisk
+%core %{_mandir}/man8/fdisk.8.gz
+%endif
+# arch ia64 m68k
+
+%ifarch %sparc ia64 m68k
+%core %{_mandir}/man8/cfdisk.8.gz
+%core %{_mandir}/man8/sfdisk.8.gz
+
+%if %{ul_extra_bin_sbin}
+%core /sbin/cfdisk
+%core /sbin/sfdisk
+%endif
+# ul_extra_bin_sbin
+
+%core %{_sbindir}/cfdisk
+%core %{_sbindir}/sfdisk
+%endif
+# arch sparc ia64 m68k
+
+%ifarch s390 s390x
+%core %{_sbindir}/fdformat
+
+%if %{ul_extra_bin_sbin}
+%core /sbin/hwclock
+%endif
+# ul_extra_bin_sbin
+
+%core %{_sbindir}/hwclock
+%core %{_bindir}/setterm
+%core %{_sbindir}/tunelp
+%core %{_mandir}/man8/fdformat.8.gz
+%core %{_mandir}/man8/hwclock.8.gz
+%core %{_mandir}/man8/tunelp.8.gz
+%endif
+# arch s390
+%endif
+# arch s390 s390x ia64 m68k sparc
+
 %files -n libblkid1
 %{_libdir}/libblkid.so.1
 %{_libdir}/libblkid.so.1.*