From 4a672277e5dd5a70a7481e60cacdbfdc46c6efec60f2424229fa592f1e30046a Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Wed, 17 Feb 2021 08:42:51 +0000
Subject: [PATCH] - Import 0.6   d3fab7c Introduce SLE-Micro branding

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-default-settings?expand=0&rev=17
---
 systemd-default-settings-0.5.tar.gz |  3 ---
 systemd-default-settings-0.6.tar.gz |  3 +++
 systemd-default-settings.changes    |  7 +++++++
 systemd-default-settings.spec       | 20 ++++++++++++++++++--
 4 files changed, 28 insertions(+), 5 deletions(-)
 delete mode 100644 systemd-default-settings-0.5.tar.gz
 create mode 100644 systemd-default-settings-0.6.tar.gz

diff --git a/systemd-default-settings-0.5.tar.gz b/systemd-default-settings-0.5.tar.gz
deleted file mode 100644
index dc6f582..0000000
--- a/systemd-default-settings-0.5.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2603bacd9587ed5ab15ed540c334b0b16145310a0644f3e1423f3f71fab9c814
-size 1784
diff --git a/systemd-default-settings-0.6.tar.gz b/systemd-default-settings-0.6.tar.gz
new file mode 100644
index 0000000..8e03378
--- /dev/null
+++ b/systemd-default-settings-0.6.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:10b6c611c0d0b08c3fc3b3a02120574328c4f476ba14cfb9bfa857e07cfad34a
+size 1833
diff --git a/systemd-default-settings.changes b/systemd-default-settings.changes
index 180dea8..5680f61 100644
--- a/systemd-default-settings.changes
+++ b/systemd-default-settings.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+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>
 
diff --git a/systemd-default-settings.spec b/systemd-default-settings.spec
index 4838ff4..717610d 100644
--- a/systemd-default-settings.spec
+++ b/systemd-default-settings.spec
@@ -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.6
 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
 
@@ -83,6 +95,7 @@ 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 30-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