From a26fc3856b1f6b38a1758aa28456b35b1a4a9b8ddc69b86f7fd2de1256aad2bd Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 8 Jan 2024 08:39:13 +0000 Subject: [PATCH] Accepting request 1137486 from home:yfjiang:branches:GNOME:Factory - Do not use _distconfdir on SLE/Leap less than version 16. OBS-URL: https://build.opensuse.org/request/show/1137486 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-software?expand=0&rev=271 --- gnome-software.changes | 5 +++++ gnome-software.spec | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gnome-software.changes b/gnome-software.changes index 342f46b..0c558b4 100644 --- a/gnome-software.changes +++ b/gnome-software.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 28 02:27:35 UTC 2023 - Yifan Jiang + +- Do not use _distconfdir on SLE/Leap less than version 16. + ------------------------------------------------------------------- Fri Dec 15 09:33:16 UTC 2023 - Christophe Marin diff --git a/gnome-software.spec b/gnome-software.spec index 7ef49e8..ef0e956 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -1,7 +1,7 @@ # # spec file for package gnome-software # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -119,9 +119,11 @@ the GNOME software store. # Remove any piece of doc that ends up in non-standard locations and use the doc macro instead rm %{buildroot}%{_datadir}/doc/%{name}/README.md +%if !0%{?sle_version} || 0%{?sle_version} >= 160000 # Move autostart file to /usr/etc mkdir -p %{buildroot}%{_distconfdir}/xdg/autostart mv %{buildroot}%{_sysconfdir}/xdg/autostart/org.gnome.Software.desktop %{buildroot}%{_distconfdir}/xdg/autostart/org.gnome.Software.desktop +%endif cat >> %{buildroot}%{_datadir}/glib-2.0/schemas/20_org.gnome.software-opensuse.gschema.override << FOE [org.gnome.software] @@ -152,7 +154,11 @@ FOE %{_libexecdir}/gnome-software-cmd %{_libexecdir}/gnome-software-restarter %{_mandir}/man1/%{name}.1%{?ext_man} +%if !0%{?sle_version} || 0%{?sle_version} >= 160000 %{_distconfdir}/xdg/autostart/org.gnome.Software.desktop +%else +%{_sysconfdir}/xdg/autostart/org.gnome.Software.desktop +%endif %dir %{_libdir}/gnome-software/plugins-%{gs_plugin_api}/ %{_libdir}/gnome-software/plugins-%{gs_plugin_api}/libgs_plugin_dpkg.so