From 0ae9148d046cda7ffd94193c87fa61842b0840d6f29b2ce1fb456bbaf1f098cb Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 18 Jan 2024 17:19:00 +0000 Subject: [PATCH 1/2] Accepting request 1139751 from home:sbrabec:branches:util-linux-comments - Minor multibuild fixes (PED-307): * Restore /bin symlinks in util-linux-systemd if building with ul_extra_bin_sbin. * Restore compatibility supplements and split-provides. * Update safety check instructions. OBS-URL: https://build.opensuse.org/request/show/1139751 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=543 --- util-linux.changes | 9 +++++++++ util-linux.spec | 14 +++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/util-linux.changes b/util-linux.changes index 7005f77..eef4eef 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Jan 18 15:09:16 UTC 2024 - Stanislav Brabec + +- Minor multibuild fixes (PED-307): + * Restore /bin symlinks in util-linux-systemd if building with + ul_extra_bin_sbin. + * Restore compatibility supplements and split-provides. + * Update safety check instructions. + ------------------------------------------------------------------- Thu Dec 7 13:22:16 UTC 2023 - Goldwyn Rodrigues diff --git a/util-linux.spec b/util-linux.spec index 6d90a5c..d3e4e29 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -1,7 +1,7 @@ # # spec file for package util-linux # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -149,6 +149,9 @@ BuildRequires: socat BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(libsystemd) BuildRequires: rubygem(asciidoctor) +Supplements: packageand(util-linux:systemd) +# Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 +Provides: util-linux:/bin/logger # man pages were moved to -systemd subpackage with 2.38.x (SLE15 SP6, Leap 15.6) Conflicts: util-linux < 2.38 %systemd_requires @@ -533,7 +536,7 @@ UTIL_LINUX_FOUND_SYSTEMD_DEPS=$(find . -type f -name "*.c" -exec grep -l '#.*if. if test "$UTIL_LINUX_KNOWN_SYSTEMD_DEPS" != "$UTIL_LINUX_FOUND_SYSTEMD_DEPS" ; then echo "List of utilities depending on systemd have changed. Please check the new util-linux-systemd file list, file removal and update of Conflicts for safe update! -Then update configure options to build what needed. +Then update %%core and/or %%exclude in the file list to build what is needed. Only then you can safely update following spec file line: UTIL_LINUX_KNOWN_SYSTEMD_DEPS='$UTIL_LINUX_FOUND_SYSTEMD_DEPS'" exit 1 @@ -891,7 +894,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %config %dir %{_sysconfdir}/issue.d %if %{ul_extra_bin_sbin} -%exclude /bin/findmnt %core /bin/kill %core %verify(not mode) %attr(%ul_suid,root,root) /bin/su %core /bin/dmesg @@ -923,10 +925,12 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %core /sbin/swaplabel %core /sbin/fstrim %core /sbin/chcpu - +%if "%ulsubset" != "systemd" +%exclude /bin/findmnt %exclude /bin/logger %exclude /bin/lsblk %endif +%endif # ul_extra_bin_sbin %core %{_bindir}/kill @@ -1301,7 +1305,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %exclude %config %dir %{_sysconfdir}/issue.d %if %{ul_extra_bin_sbin} -%exclude /bin/findmnt +/bin/findmnt /bin/logger /bin/lsblk %endif From 4e5fdb2f9bb4791a1ed81b4f131b857e5f13339e6c6a0e3c2cf334d61750b0e7 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 19 Jan 2024 10:30:53 +0000 Subject: [PATCH 2/2] replace archaic packageand() from r543 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=544 --- util-linux.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util-linux.spec b/util-linux.spec index d3e4e29..7eeeec8 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -149,7 +149,7 @@ BuildRequires: socat BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(libsystemd) BuildRequires: rubygem(asciidoctor) -Supplements: packageand(util-linux:systemd) +Supplements: (util-linux and systemd) # Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 Provides: util-linux:/bin/logger # man pages were moved to -systemd subpackage with 2.38.x (SLE15 SP6, Leap 15.6)