From 30647487ad044b7031799718cb759d5be8a76d00 Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Wed, 19 Apr 2023 16:05:39 +0000 Subject: [PATCH 1/2] - Correct location for Desktop drop-in config - Clean up invalid desktop drop-in file - 20230419 OBS-URL: https://build.opensuse.org/package/show/devel:microos/plasma-branding-MicroOS?expand=0&rev=13 --- plasma-branding-MicroOS.changes | 7 +++++++ plasma-branding-MicroOS.spec | 14 +++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/plasma-branding-MicroOS.changes b/plasma-branding-MicroOS.changes index d1655a6..dd21d55 100644 --- a/plasma-branding-MicroOS.changes +++ b/plasma-branding-MicroOS.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Apr 19 16:04:49 UTC 2023 - Richard Brown + +- Correct location for Desktop drop-in config +- Clean up invalid desktop drop-in file +- 20230419 + ------------------------------------------------------------------- Fri Mar 24 16:26:45 UTC 2023 - Richard Brown diff --git a/plasma-branding-MicroOS.spec b/plasma-branding-MicroOS.spec index 8d1c4ea..2db523b 100644 --- a/plasma-branding-MicroOS.spec +++ b/plasma-branding-MicroOS.spec @@ -35,7 +35,7 @@ Requires: libqt5-qdbus Requires: sound-theme-freedesktop Requires: transactional-update Conflicts: gnome-branding-MicroOS -Version: 20230323 +Version: 20230419 Release: 0 %description @@ -58,10 +58,14 @@ install -d %{buildroot}%{_sysconfdir}/skel/.config/autostart install -m0644 mod-firstboot.desktop %{buildroot}%{_sysconfdir}/skel/.config/autostart/mod-firstboot.desktop install -d %{buildroot}%{_bindir} install -m0755 mod-firstboot %{buildroot}%{_bindir}/mod-firstboot -install -d %{buildroot}%{_prefix}%{_sysconfdir}/transactional-update.d -install -m644 50-desktop.conf %{buildroot}%{_prefix}%{_sysconfdir}/transactional-update.d/50-desktop.conf +install -d %{buildroot}%{_prefix}%{_sysconfdir}/transactional-update.conf.d +install -m644 50-desktop.conf %{buildroot}%{_prefix}%{_sysconfdir}/transactional-update.conf.d/50-desktop.conf %post +# Cleanup invalid (never used) location of 50-desktop.conf dropin +if test %{_prefix}%{_sysconfdir}/transactional-update.d/50-desktop.conf + rm %{_prefix}%{_sysconfdir}/transactional-update.d/50-desktop.conf +fi %postun @@ -73,7 +77,7 @@ install -m644 50-desktop.conf %{buildroot}%{_prefix}%{_sysconfdir}/transactional %dir %{_sysconfdir}/skel/.config/autostart %config(noreplace) %{_sysconfdir}/skel/.config/autostart/mod-firstboot.desktop %{_bindir}/mod-firstboot -%dir %{_prefix}%{_sysconfdir}/transactional-update.d -%{_prefix}%{_sysconfdir}/transactional-update.d/50-desktop.conf +%dir %{_prefix}%{_sysconfdir}/transactional-update.conf.d +%{_prefix}%{_sysconfdir}/transactional-update.conf.d/50-desktop.conf %changelog From 68464cf969430cbf7092e7b7cb78bcad0a5bc6b5 Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Thu, 20 Apr 2023 10:48:29 +0000 Subject: [PATCH 2/2] - Remove unneeded cleanup of desktop drop-in - 20230420 OBS-URL: https://build.opensuse.org/package/show/devel:microos/plasma-branding-MicroOS?expand=0&rev=14 --- plasma-branding-MicroOS.changes | 6 ++++++ plasma-branding-MicroOS.spec | 6 +----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/plasma-branding-MicroOS.changes b/plasma-branding-MicroOS.changes index dd21d55..f659673 100644 --- a/plasma-branding-MicroOS.changes +++ b/plasma-branding-MicroOS.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 20 10:48:13 UTC 2023 - Richard Brown + +- Remove unneeded cleanup of desktop drop-in +- 20230420 + ------------------------------------------------------------------- Wed Apr 19 16:04:49 UTC 2023 - Richard Brown diff --git a/plasma-branding-MicroOS.spec b/plasma-branding-MicroOS.spec index 2db523b..652d016 100644 --- a/plasma-branding-MicroOS.spec +++ b/plasma-branding-MicroOS.spec @@ -35,7 +35,7 @@ Requires: libqt5-qdbus Requires: sound-theme-freedesktop Requires: transactional-update Conflicts: gnome-branding-MicroOS -Version: 20230419 +Version: 20230420 Release: 0 %description @@ -62,10 +62,6 @@ install -d %{buildroot}%{_prefix}%{_sysconfdir}/transactional-update.conf.d install -m644 50-desktop.conf %{buildroot}%{_prefix}%{_sysconfdir}/transactional-update.conf.d/50-desktop.conf %post -# Cleanup invalid (never used) location of 50-desktop.conf dropin -if test %{_prefix}%{_sysconfdir}/transactional-update.d/50-desktop.conf - rm %{_prefix}%{_sysconfdir}/transactional-update.d/50-desktop.conf -fi %postun