diff --git a/systemd-default-settings-0.7-1-g6b8dde1.tar.gz b/systemd-default-settings-0.7-1-g6b8dde1.tar.gz deleted file mode 100644 index e8ca32c..0000000 --- a/systemd-default-settings-0.7-1-g6b8dde1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:52044165a1452b9964c461eb8905cc85cbec79b979d19f0a74b8b16f2c0eec6b -size 1857 diff --git a/systemd-default-settings-0.8.tar.gz b/systemd-default-settings-0.8.tar.gz new file mode 100644 index 0000000..5eb7d3f --- /dev/null +++ b/systemd-default-settings-0.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ea20048ab409fc3e4e366dd09686057323de505cc5f28ff7920d7701467bf83 +size 1828 diff --git a/systemd-default-settings.changes b/systemd-default-settings.changes index 242a27a..c9be901 100644 --- a/systemd-default-settings.changes +++ b/systemd-default-settings.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Fri Oct 20 07:03:56 UTC 2023 - Franck Bui + +- The usage of drop-ins is now the official way for configuring systemd and its + various daemons on Factory/ALP. Hence the early drop-ins SUSE specific + "feature" has been abandoned. + +------------------------------------------------------------------- +Thu Oct 19 16:03:07 UTC 2023 - Franck Bui + +- Import 0.8 + + f34372f User priority '26' for SLE-Micro + c8b6f0a Revert "Convert more drop-ins into early ones" + ------------------------------------------------------------------- Tue Sep 21 08:20:59 UTC 2021 - Franck Bui diff --git a/systemd-default-settings.spec b/systemd-default-settings.spec index ac0a7cc..9f6aa16 100644 --- a/systemd-default-settings.spec +++ b/systemd-default-settings.spec @@ -1,7 +1,7 @@ # # spec file for package systemd-default-settings # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,13 +16,13 @@ # -%define extra_version -1-g6b8dde1 +%define extra_version %{nil} Name: systemd-default-settings URL: https://github.com/openSUSE/systemd-default-settings -Version: 0.7 +Version: 0.8 Release: 0 -Summary: Customization of systemd default settings for SUSE distributions +Summary: Generic SUSE Customization of systemd defaults License: GPL-2.0-or-later Group: System/Base Source0: %{name}-%{version}%{extra_version}.tar.gz @@ -38,7 +38,7 @@ This package should not be installed alone but is supposed to be pulled in by the branding package instead. %package branding-SLE -Summary: Specific customization of systemd defaults settings for SLE +Summary: SLE Specific Customization of systemd defaults Group: System/Base Requires: %{name} = %{version}-%{release} Supplements: packageand(%{name}:branding-SLE) @@ -50,7 +50,7 @@ This package overrides some of the upstream default settings to make them better suited for SLE distributions. %package branding-openSUSE -Summary: Specific customization of systemd defaults settings for openSUSE +Summary: openSUSE Specific Customization of systemd defaults Group: System/Base Requires: %{name} = %{version}-%{release} Supplements: packageand(%{name}:branding-openSUSE) @@ -62,7 +62,7 @@ This package overrides some of the upstream default settings to make them better suited for openSUSE distributions. %package branding-upstream -Summary: Restore upstream systemd defaults settings +Summary: Restore upstream systemd defaults Group: System/Base Provides: %{name}-branding = %{version}-%{release} Conflicts: %{name} @@ -74,7 +74,7 @@ by uninstalling all drop-ins shipped by %{name} and its branding sub package. %package branding-SLE-Micro -Summary: Specific customization of systemd defaults settings for SLE-Micro +Summary: SLE-Micro Specific Customization of systemd defaults Group: System/Base Requires: %{name} = %{version}-%{release} Supplements: packageand(%{name}:branding-SLE-Micro) @@ -93,6 +93,13 @@ them better suited for SLE-Micro distributions. %install %make_install +# Convert early drop-ins into regular ones on Factory (1699) and ALP (1600). The +# removal of early drop-ins happens on these 2 distros only. SLE15/Leap15 (1500) +# still relies one them. +%if %{suse_version} >= 1600 +find %{buildroot} -name __\*.conf -exec rename '.conf.d/__' '.conf.d/' {} \; +%endif + find %{buildroot} -name \*.d -type d -printf "%%%%dir /%%P\n" >SUSE.list find %{buildroot} -name \*-defaults-SUSE.conf -printf "/%%P\n" >>SUSE.list find %{buildroot} -name \*-defaults-SLE.conf -printf "/%%P\n" >SLE.list