From a8ff50db8dc1ff32cea3c688824acfdc3e3ea0cb0868603af486bb00ea9336cf Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 28 Nov 2019 11:35:43 +0000 Subject: [PATCH] Accepting request 751563 from GNOME:Next OBS-URL: https://build.opensuse.org/request/show/751563 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-software?expand=0&rev=172 --- gnome-software.changes | 6 ++++++ gnome-software.spec | 21 ++++++++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/gnome-software.changes b/gnome-software.changes index f7c1e3c..5e18f8b 100644 --- a/gnome-software.changes +++ b/gnome-software.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 28 09:48:12 UTC 2019 - Frederic Crozat + +- Don't start gnome-software at startup and disable its search + extension on SLE until bsc#1157928 is fixed properly. + ------------------------------------------------------------------- Wed Nov 27 10:22:33 UTC 2019 - Yifan Jiang diff --git a/gnome-software.spec b/gnome-software.spec index bd61aed..80eb808 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -1,7 +1,7 @@ # # spec file for package gnome-software # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -90,6 +90,20 @@ GNOME software store plugins. # 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%{?is_opensuse} +#workaround until bsc#1157928 is resolved, otherwise SLES users get authentication popup all the time +cat << EOF >> %{buildroot}%{_sysconfdir}/xdg/autostart/gnome-software-service.desktop +Hidden=true +EOF + +cat << EOF > %{buildroot}%{_datadir}/glib-2.0/schemas/00_org.gnome.software.gschema.override +#workaround until bsc#1157928 is resolved, otherwise SLES users get authentication popup all the time +[org.gnome.desktop.search-providers] +disabled=["org.gnome.Software.desktop"] +EOF + +%endif + %files %license COPYING %doc NEWS README.md @@ -105,13 +119,14 @@ rm %{buildroot}%{_datadir}/doc/%{name}/README.md %{_datadir}/metainfo/org.gnome.Software.Plugin.Flatpak.metainfo.xml %{_datadir}/metainfo/org.gnome.Software.Plugin.Fwupd.metainfo.xml %{_datadir}/metainfo/org.gnome.Software.Plugin.Odrs.metainfo.xml -# Test shipping gnome-software-local-file in GN -# Currently not shipped, as this is not yet functional (boo#941862) %{_datadir}/applications/gnome-software-local-file.desktop %{_datadir}/applications/org.gnome.Software.desktop %{_datadir}/dbus-1/services/org.gnome.Software.service %{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service %{_datadir}/glib-2.0/schemas/org.gnome.software.gschema.xml +%if !0%{?is_opensuse} +%{_datadir}/glib-2.0/schemas/00_org.gnome.software.gschema.override +%endif %dir %{_datadir}/gnome-shell %dir %{_datadir}/gnome-shell/search-providers %{_datadir}/gnome-shell/search-providers/org.gnome.Software-search-provider.ini