Accepting request 1123497 from home:yfjiang:branches:GNOME:Factory

- Support build environments like SLE 15 SP5 and Leap 15.5 which
  had %{_distconfdir) not defined yet.

OBS-URL: https://build.opensuse.org/request/show/1123497
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-initial-setup?expand=0&rev=130
This commit is contained in:
Bjørn Lie 2023-11-07 09:19:18 +00:00 committed by Git OBS Bridge
parent 91a9b15ec3
commit 5ba3bd178a
2 changed files with 13 additions and 2 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Nov 6 06:43:02 UTC 2023 - Yifan Jiang <yfjiang@suse.com>
- Support build environments like SLE 15 SP5 and Leap 15.5 which
had %{_distconfdir) not defined yet.
-------------------------------------------------------------------
Mon Sep 18 16:28:19 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>

View File

@ -85,10 +85,12 @@ Initial assistant, helping you to get the system up and running.
%meson_install
%find_lang %{name} %{?no_lang_C}
%if !0%{?sle_version}
# Move autostart file to /usr/etc
mkdir -p %{buildroot}%{_distconfdir}/xdg/autostart
mv %{buildroot}%{_sysconfdir}/xdg/autostart/gnome-initial-setup-copy-worker.desktop %{buildroot}%{_distconfdir}/xdg/autostart/gnome-initial-setup-copy-worker.desktop
mv %{buildroot}%{_sysconfdir}/xdg/autostart/gnome-initial-setup-first-login.desktop %{buildroot}%{_distconfdir}/xdg/autostart/gnome-initial-setup-first-login.desktop
%endif
%pre -f %{name}.pre
@ -111,10 +113,13 @@ Initial assistant, helping you to get the system up and running.
%{_datadir}/dconf/profile/gnome-initial-setup
%dir %{_datadir}/gnome-initial-setup
%{_datadir}/gnome-initial-setup/initial-setup-dconf-defaults
#%%{_sysconfdir}/xdg/autostart/gnome-initial-setup-copy-worker.desktop
%if !0%{?sle_version}
%{_distconfdir}/xdg/autostart/gnome-initial-setup-copy-worker.desktop
#%%{_sysconfdir}/xdg/autostart/gnome-initial-setup-first-login.desktop
%{_distconfdir}/xdg/autostart/gnome-initial-setup-first-login.desktop
%else
%{_sysconfdir}/xdg/autostart/gnome-initial-setup-copy-worker.desktop
%{_sysconfdir}/xdg/autostart/gnome-initial-setup-first-login.desktop
%endif
%if !0%{?sle_version} || 0%{?sle_version} >= 160000
%{_userunitdir}/gnome-initial-setup-copy-worker.service
%{_userunitdir}/gnome-initial-setup-first-login.service