Accepting request 874410 from Base:System

- Import 0.7
  2a61f77 Convert our configuration file dropins into 'early' ones

- Import 0.6
  d3fab7c Introduce SLE-Micro branding

OBS-URL: https://build.opensuse.org/request/show/874410
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd-default-settings?expand=0&rev=5
This commit is contained in:
Richard Brown 2021-02-25 17:26:32 +00:00 committed by Git OBS Bridge
commit 6b2a8720d9
4 changed files with 38 additions and 8 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2603bacd9587ed5ab15ed540c334b0b16145310a0644f3e1423f3f71fab9c814
size 1784

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f2c55e17d366d6a03078bdc9125c1063ab7cb10a30da35539b1f68518f95b658
size 1834

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Feb 22 16:49:16 UTC 2021 - Franck Bui <fbui@suse.com>
- Import 0.7
2a61f77 Convert our configuration file dropins into 'early' ones
-------------------------------------------------------------------
Wed Feb 17 08:40:19 UTC 2021 - Franck Bui <fbui@suse.com>
- Import 0.6
d3fab7c Introduce SLE-Micro branding
-------------------------------------------------------------------
Thu Nov 26 16:04:48 UTC 2020 - Franck Bui <fbui@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package systemd-default-settings
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,7 +18,7 @@
Name: systemd-default-settings
URL: https://github.com/openSUSE/systemd-default-settings
Version: 0.5
Version: 0.7
Release: 0
Summary: Customization of systemd default settings for SUSE distributions
License: GPL-2.0-or-later
@ -71,6 +71,18 @@ Installing this package restores some of the upstream default settings
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
Group: System/Base
Requires: %{name} = %{version}-%{release}
Supplements: packageand(%{name}:branding-SLE-Micro)
Provides: %{name}-branding = %{version}-%{release}
Conflicts: otherproviders(%{name}-branding)
%description branding-SLE-Micro
This package overrides some of the upstream default settings to make
them better suited for SLE-Micro distributions.
%prep
%setup -q
@ -80,9 +92,10 @@ package.
%make_install
find %{buildroot} -name \*.d -type d -printf "%%%%dir /%%P\n" >SUSE.list
find %{buildroot} -name 20-defaults-SUSE.conf -printf "/%%P\n" >>SUSE.list
find %{buildroot} -name 25-defaults-SLE.conf -printf "/%%P\n" >SLE.list
find %{buildroot} -name 25-defaults-openSUSE.conf -printf "/%%P\n" >openSUSE.list
find %{buildroot} -name \*-defaults-SUSE.conf -printf "/%%P\n" >>SUSE.list
find %{buildroot} -name \*-defaults-SLE.conf -printf "/%%P\n" >SLE.list
find %{buildroot} -name \*-defaults-openSUSE.conf -printf "/%%P\n" >openSUSE.list
find %{buildroot} -name \*-defaults-SLE-Micro.conf -printf "/%%P\n" >SLE-Micro.list
%post
# Reloading PID1 is probably not enough as some changes will require
@ -103,4 +116,7 @@ find %{buildroot} -name 25-defaults-openSUSE.conf -printf "/%%P\n" >openSUSE.lis
%files branding-upstream
%defattr(-,root,root)
%files branding-SLE-Micro -f SLE.list -f SLE-Micro.list
%defattr(-,root,root)
%changelog