Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/gnome-software.git#7bc2a78ecdfedf4af42f0d122a0500df1ed149f4

.gitignore

@@ -114,3 +114,4 @@
 /gnome-software-3.37.92.tar.xz
 /gnome-software-3.38.0.tar.xz
 /gnome-software-3.38.1.tar.xz
+/gnome-software-40.beta.tar.xz

gnome-software.spec

@@ -1,23 +1,25 @@
-%global appstream_glib_version 0.7.15
+%global appstream_version 0.14.0
 %global libxmlb_version 0.1.7
 %global glib2_version 2.61.1
 %global gtk3_version 3.22.4
 %global json_glib_version 1.2.0
 %global libsoup_version 2.52.0
-%global gnome_desktop_version 3.18.0
 %global packagekit_version 1.1.1
 %global fwupd_version 1.3.3
 %global flatpak_version 1.5.1
 
+%global tarball_version %%(echo %{version} | tr '~' '.')
+
 Name:      gnome-software
-Version:   3.38.1
+Version:   40~beta
 Release:   1%{?dist}
 Summary:   A software center for GNOME
 
 License:   GPLv2+
 URL:       https://wiki.gnome.org/Apps/Software
-Source0:   https://download.gnome.org/sources/gnome-software/3.38/%{name}-%{version}.tar.xz
+Source0:   https://download.gnome.org/sources/gnome-software/40/%{name}-%{tarball_version}.tar.xz
 
+BuildRequires: appstream-devel >= %{appstream_version}
 BuildRequires: gcc
 BuildRequires: gettext
 BuildRequires: libxslt
@@ -25,15 +27,14 @@ BuildRequires: docbook-style-xsl
 BuildRequires: desktop-file-utils
 BuildRequires: fwupd-devel >= %{fwupd_version}
 BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: gnome-desktop3-devel
 BuildRequires: gnome-online-accounts-devel
 BuildRequires: gsettings-desktop-schemas-devel
 BuildRequires: gspell-devel
 BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: gtk-doc
 BuildRequires: json-glib-devel >= %{json_glib_version}
-BuildRequires: libappstream-glib-devel >= %{appstream_glib_version}
 BuildRequires: libdnf-devel
+BuildRequires: libhandy1-devel
 BuildRequires: libsoup-devel
 BuildRequires: libxmlb-devel >= %{libxmlb_version}
 BuildRequires: meson
@@ -48,18 +49,17 @@ BuildRequires: sysprof-devel
 BuildRequires: valgrind-devel
 
 Requires: appstream-data
+Requires: appstream%{?_isa} >= %{appstream_version}
 Requires: flatpak%{?_isa} >= %{flatpak_version}
 Requires: flatpak-libs%{?_isa} >= %{flatpak_version}
 Requires: fwupd%{?_isa} >= %{fwupd_version}
 Requires: glib2%{?_isa} >= %{glib2_version}
-Requires: gnome-desktop3%{?_isa} >= %{gnome_desktop_version}
 # gnome-menus is needed for app folder .directory entries
 Requires: gnome-menus%{?_isa}
 Requires: gsettings-desktop-schemas%{?_isa}
 Requires: gtk3%{?_isa} >= %{gtk3_version}
 Requires: json-glib%{?_isa} >= %{json_glib_version}
 Requires: iso-codes
-Requires: libappstream-glib%{?_isa} >= %{appstream_glib_version}
 # librsvg2 is needed for gdk-pixbuf svg loader
 Requires: librsvg2%{?_isa}
 Requires: libsoup%{?_isa} >= %{libsoup_version}
@@ -71,7 +71,7 @@ Obsoletes: gnome-software-snap < 3.33.1
 Obsoletes: gnome-software-editor < 3.35.1
 
 # this is not a library version
-%define gs_plugin_version               13
+%define gs_plugin_version               14
 
 %description
 gnome-software is an application that makes it easy to add, remove
@@ -98,7 +98,7 @@ and update software in the GNOME desktop.
 This package includes the rpm-ostree backend.
 
 %prep
-%autosetup -p1
+%autosetup -p1 -n %{name}-%{tarball_version}
 
 %build
 %meson \
@@ -155,8 +155,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/metainfo/org.gnome.Software.Plugin.Odrs.metainfo.xml
 %dir %{_libdir}/gs-plugins-%{gs_plugin_version}
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_appstream.so
-%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_desktop-categories.so
-%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_desktop-menu-path.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_dummy.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_fedora-langpacks.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_fedora-pkgdb-collections.so
@@ -206,6 +204,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/gtk-doc/html/gnome-software
 
 %changelog
+* Tue Feb 16 2021 Kalev Lember <klember@redhat.com> - 40~beta-1
+- Update to 40.beta
+
 * Mon Feb 08 2021 Richard Hughes <richard@hughsie.com> - 3.38.1-1
 - New upstream version
 - Fix package details not found for some packages

sources

@@ -1 +1 @@
-SHA512 (gnome-software-3.38.1.tar.xz) = 155f80836a28775a646d0f64713557708039076d7611829b75257ddc7dd471a8135769f953cb147ff4e116723f402fa95a56d3f63c654b4bd0455e6415278341
+SHA512 (gnome-software-40.beta.tar.xz) = 39edf94a3091b8c6e00925cf4e5fab929fbd5166ab35caf247415753bbae8c6ea0df51a80fa2fa7ba35ca64d5b7ce44359b9a451c7f6f3424e1716ed8b493dd4