sbrabec/util-linux
SHA256
1
0
Fork 0
forked from pool/util-linux
Code Pull Requests Activity

Accepting request 1139900 from Base:System

Browse Source 
- Minor multibuild fixes (PED-307):

- modern Supplements

OBS-URL: https://build.opensuse.org/request/show/1139900
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=281
This commit is contained in:
Ana Guerrero 2024-01-22 19:30:04 +00:00 committed by Git OBS Bridge
commit 30967c878f
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
util-linux.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Jan 18 15:09:16 UTC 2024 - Stanislav Brabec <sbrabec@suse.com>
- 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 <rgoldwyn@suse.com> Thu Dec 7 13:22:16 UTC 2023 - Goldwyn Rodrigues <rgoldwyn@suse.com>

14
util-linux.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package util-linux # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -149,6 +149,9 @@ BuildRequires: socat
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libsystemd)
BuildRequires: rubygem(asciidoctor) BuildRequires: rubygem(asciidoctor)
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) # man pages were moved to -systemd subpackage with 2.38.x (SLE15 SP6, Leap 15.6)
Conflicts: util-linux < 2.38 Conflicts: util-linux < 2.38
%systemd_requires %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 if test "$UTIL_LINUX_KNOWN_SYSTEMD_DEPS" != "$UTIL_LINUX_FOUND_SYSTEMD_DEPS" ; then
echo "List of utilities depending on systemd have changed. 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! 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: Only then you can safely update following spec file line:
UTIL_LINUX_KNOWN_SYSTEMD_DEPS='$UTIL_LINUX_FOUND_SYSTEMD_DEPS'" UTIL_LINUX_KNOWN_SYSTEMD_DEPS='$UTIL_LINUX_FOUND_SYSTEMD_DEPS'"
exit 1 exit 1
@ -891,7 +894,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%config %dir %{_sysconfdir}/issue.d %config %dir %{_sysconfdir}/issue.d
%if %{ul_extra_bin_sbin} %if %{ul_extra_bin_sbin}
%exclude /bin/findmnt
%core /bin/kill %core /bin/kill
%core %verify(not mode) %attr(%ul_suid,root,root) /bin/su %core %verify(not mode) %attr(%ul_suid,root,root) /bin/su
%core /bin/dmesg %core /bin/dmesg
@ -923,10 +925,12 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%core /sbin/swaplabel %core /sbin/swaplabel
%core /sbin/fstrim %core /sbin/fstrim
%core /sbin/chcpu %core /sbin/chcpu
%if "%ulsubset" != "systemd"
%exclude /bin/findmnt
%exclude /bin/logger %exclude /bin/logger
%exclude /bin/lsblk %exclude /bin/lsblk
%endif %endif
%endif
# ul_extra_bin_sbin # ul_extra_bin_sbin
%core %{_bindir}/kill %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 %exclude %config %dir %{_sysconfdir}/issue.d
%if %{ul_extra_bin_sbin} %if %{ul_extra_bin_sbin}
%exclude /bin/findmnt /bin/findmnt
/bin/logger /bin/logger
/bin/lsblk /bin/lsblk
%endif %endif