diff --git a/gnome-software.spec b/gnome-software.spec index 535b6b8..d4af7ff 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -14,7 +14,7 @@ Name: gnome-software Version: 3.32.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A software center for GNOME License: GPLv2+ @@ -49,10 +49,6 @@ BuildRequires: rpm-devel BuildRequires: rpm-ostree-devel BuildRequires: libgudev1-devel BuildRequires: valgrind-devel -BuildRequires: liboauth-devel -%if 0%{?fedora} -BuildRequires: snapd-glib-devel >= 1.42 -%endif Requires: appstream-data %if 0%{?fedora} @@ -77,6 +73,8 @@ Requires: libxmlb%{?_isa} >= %{libxmlb_version} Recommends: PackageKit%{?_isa} >= %{packagekit_version} +Obsoletes: gnome-software-snap < 3.32.3-5 + # this is not a library version %define gs_plugin_version 13 @@ -111,27 +109,12 @@ and update software in the GNOME desktop. This package includes the rpm-ostree backend. -%if 0%{?fedora} -%package snap -Summary: Support for Ubuntu Snap packages -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: snapd -Supplements: (gnome-software%{?_isa} and snapd%{?_isa}) - -%description snap -Adds support for Snap packages from the Snap store. -%endif - %prep %autosetup -p1 %build %meson \ -%if 0%{?fedora} - -Dsnap=true \ -%else -Dsnap=false \ -%endif -Dgudev=true \ -Dpackagekit=true \ -Dexternal_appstream=false \ @@ -227,12 +210,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %files rpm-ostree %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_rpm-ostree.so -%if 0%{?fedora} -%files snap -%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_snap.so -%{_datadir}/metainfo/org.gnome.Software.Plugin.Snap.metainfo.xml -%endif - %files devel %{_libdir}/pkgconfig/gnome-software.pc %dir %{_includedir}/gnome-software @@ -245,6 +222,15 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_mandir}/man1/gnome-software-editor.1* %changelog +* Thu Jul 11 2019 Richard Hughes - 3.32.3-5 +- Disable the snap plugin. Canonical upstream are not going to be installing + gnome-software in the next LTS, prefering instead to ship a "Snap Store" + rather than GNOME Software. +- Enabling the snap plugin also enables the Snap Store which violated the same + rules which prevented us installing Flathub by default. +- The existing plugin is barely maintained and I don't want to be the one + responsible when it breaks. + * Thu Jun 13 2019 Kalev Lember - 3.32.3-4 - Rebuild for accidental libflatpak ABI break