- Use new transactional-update drop-in config for Desktop

notification configuration
- 20230323

OBS-URL: https://build.opensuse.org/package/show/devel:microos/plasma-branding-MicroOS?expand=0&rev=11
This commit is contained in:
Richard Brown 2023-03-24 16:32:16 +00:00 committed by Git OBS Bridge
parent 102d33200b
commit 38a753f413
3 changed files with 15 additions and 3 deletions

1
50-desktop.conf Normal file
View File

@ -0,0 +1 @@
REBOOT_METHOD=notify

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Mar 24 16:26:45 UTC 2023 - Richard Brown <rbrown@suse.com>
- Use new transactional-update drop-in config for Desktop
notification configuration
- 20230323
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 14 18:07:18 UTC 2023 - Shawn Dunn <sfalken@opensuse.org> Tue Feb 14 18:07:18 UTC 2023 - Shawn Dunn <sfalken@opensuse.org>

View File

@ -24,6 +24,7 @@ Source: COPYING
Source1: flathub.flatpakrepo Source1: flathub.flatpakrepo
Source2: mod-firstboot.desktop Source2: mod-firstboot.desktop
Source3: mod-firstboot Source3: mod-firstboot
Source4: 50-desktop.conf
BuildArch: noarch BuildArch: noarch
BuildRequires: flatpak BuildRequires: flatpak
BuildRequires: transactional-update BuildRequires: transactional-update
@ -34,7 +35,7 @@ Requires: libqt5-qdbus
Requires: sound-theme-freedesktop Requires: sound-theme-freedesktop
Requires: transactional-update Requires: transactional-update
Conflicts: gnome-branding-MicroOS Conflicts: gnome-branding-MicroOS
Version: 20230214 Version: 20230323
Release: 0 Release: 0
%description %description
@ -46,6 +47,7 @@ cp -a %{SOURCE0} COPYING
cp -a %{SOURCE1} flathub.flatpakrepo cp -a %{SOURCE1} flathub.flatpakrepo
cp -a %{SOURCE2} mod-firstboot.desktop cp -a %{SOURCE2} mod-firstboot.desktop
cp -a %{SOURCE3} mod-firstboot cp -a %{SOURCE3} mod-firstboot
cp -a %{SOURCE4} 50-desktop.conf
%build %build
@ -56,12 +58,12 @@ install -d %{buildroot}%{_sysconfdir}/skel/.config/autostart
install -m0644 mod-firstboot.desktop %{buildroot}%{_sysconfdir}/skel/.config/autostart/mod-firstboot.desktop install -m0644 mod-firstboot.desktop %{buildroot}%{_sysconfdir}/skel/.config/autostart/mod-firstboot.desktop
install -d %{buildroot}%{_bindir} install -d %{buildroot}%{_bindir}
install -m0755 mod-firstboot %{buildroot}%{_bindir}/mod-firstboot 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
%post %post
sed -i 's/^#REBOOT_METHOD=auto/REBOOT_METHOD=notify/' %{_prefix}%{_sysconfdir}/transactional-update.conf
%postun %postun
sed -i 's/^REBOOT_METHOD=notify/#REBOOT_METHOD=auto/' %{_prefix}%{_sysconfdir}/transactional-update.conf
%files %files
%license COPYING %license COPYING
@ -71,5 +73,7 @@ sed -i 's/^REBOOT_METHOD=notify/#REBOOT_METHOD=auto/' %{_prefix}%{_sysconfdir}/t
%dir %{_sysconfdir}/skel/.config/autostart %dir %{_sysconfdir}/skel/.config/autostart
%config(noreplace) %{_sysconfdir}/skel/.config/autostart/mod-firstboot.desktop %config(noreplace) %{_sysconfdir}/skel/.config/autostart/mod-firstboot.desktop
%{_bindir}/mod-firstboot %{_bindir}/mod-firstboot
%dir %{_prefix}%{_sysconfdir}/transactional-update.d
%{_prefix}%{_sysconfdir}/transactional-update.d/50-desktop.conf
%changelog %changelog