diff --git a/util-linux.changes b/util-linux.changes index 52e68fa..ad4e8ba 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,18 +1,24 @@ +------------------------------------------------------------------- +Thu Jan 26 08:07:21 UTC 2023 - Dominique Leuenberger + +- Fix previous commit: setterm, cfdisk, fdformat, hwclock, sfdisk, + and tunelp unintentionally fell out of both variants. + ------------------------------------------------------------------- Wed Jan 25 11:30:57 UTC 2023 - Dominique Leuenberger - Exclude these binaries from the -systemd build, as they exist in the core package already: - + /usr/bin/lslocks - + /usr/bin/setterm - + /usr/bin/wall - + /usr/bin/write - + /usr/sbin/cfdisk - + /usr/sbin/fdformat - + /usr/sbin/fdisk - + /usr/sbin/hwclock - + /usr/sbin/sfdisk - + /usr/sbin/tunelp + + /usr/bin/lslocks + + /usr/bin/setterm + + /usr/bin/wall + + /usr/bin/write + + /usr/sbin/cfdisk + + /usr/sbin/fdformat + + /usr/sbin/fdisk + + /usr/sbin/hwclock + + /usr/sbin/sfdisk + + /usr/sbin/tunelp ------------------------------------------------------------------- Wed Jan 11 07:58:00 UTC 2023 - Dominique Leuenberger diff --git a/util-linux.spec b/util-linux.spec index 6923a7b..cbc55d8 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -27,11 +27,13 @@ %define psuffix -core %define ulbuild base %define ulsubset core +%define core %nil %endif %if "%{flavor}" == "systemd" %define ulbuild base %define ulsubset systemd +%define core %exclude %endif # All python flavors are build separately. No module can be built together with base. @@ -1237,32 +1239,32 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : # Files not common for all architectures %ifnarch ia64 m68k %if %{ul_extra_bin_sbin} -/sbin/fdisk +%core /sbin/fdisk %endif -%{_sbindir}/fdisk -%{_mandir}/man8/fdisk.8.gz +%core %{_sbindir}/fdisk +%core %{_mandir}/man8/fdisk.8.gz %endif %ifnarch %sparc ia64 m68k -%{_mandir}/man8/cfdisk.8.gz -%{_mandir}/man8/sfdisk.8.gz +%core %{_mandir}/man8/cfdisk.8.gz +%core %{_mandir}/man8/sfdisk.8.gz %if %{ul_extra_bin_sbin} -/sbin/cfdisk -/sbin/sfdisk +%core /sbin/cfdisk +%core /sbin/sfdisk %endif -%exclude %{_sbindir}/cfdisk -%exclude %{_sbindir}/sfdisk +%core %{_sbindir}/cfdisk +%core %{_sbindir}/sfdisk %endif %ifnarch s390 s390x -%exclude %{_sbindir}/fdformat +%core %{_sbindir}/fdformat %if %{ul_extra_bin_sbin} -%exclude /sbin/hwclock +%core /sbin/hwclock %endif -%exclude %{_sbindir}/hwclock -%exclude %{_bindir}/setterm -%exclude %{_sbindir}/tunelp -%{_mandir}/man8/fdformat.8.gz -%{_mandir}/man8/hwclock.8.gz -%{_mandir}/man8/tunelp.8.gz +%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 %if "%ulsubset" == "core"