Update to 3.31.92

This commit is contained in:
Kalev Lember 2019-03-05 23:15:45 +01:00
parent c4a5cacedd
commit a5e4472f28
4 changed files with 8 additions and 72 deletions

1
.gitignore vendored
View File

@ -99,3 +99,4 @@
/gnome-software-3.31.2.tar.xz
/gnome-software-3.31.90.tar.xz
/libdnf-7ecb2f5.tar.gz
/gnome-software-3.31.92.tar.xz

View File

@ -1,64 +0,0 @@
From d54bdc6d6f10b0a1e30c36a38ac1d9355c9a75ec Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Wed, 24 Oct 2018 15:00:59 +0200
Subject: [PATCH] Lower as_utils_vercmp_full version check for Fedora
We have new as_utils_vercmp_full API backported to
libappstream-glib-0.7.14-2.fc29.
---
lib/gs-plugin-loader.c | 2 +-
plugins/core/gs-appstream.c | 2 +-
src/gs-update-dialog.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/gs-plugin-loader.c b/lib/gs-plugin-loader.c
index 68fff0e10..9055c532b 100644
--- a/lib/gs-plugin-loader.c
+++ b/lib/gs-plugin-loader.c
@@ -1389,7 +1389,7 @@ gs_plugin_loader_app_sort_prio_cb (GsApp *app1, GsApp *app2, gpointer user_data)
static gint
gs_plugin_loader_app_sort_version_cb (GsApp *app1, GsApp *app2, gpointer user_data)
{
-#if AS_CHECK_VERSION(0,7,15)
+#if AS_CHECK_VERSION(0,7,14)
return as_utils_vercmp_full (gs_app_get_version (app1),
gs_app_get_version (app2),
AS_VERSION_COMPARE_FLAG_NONE);
diff --git a/plugins/core/gs-appstream.c b/plugins/core/gs-appstream.c
index 62fef53c8..4bbf5c69a 100644
--- a/plugins/core/gs-appstream.c
+++ b/plugins/core/gs-appstream.c
@@ -665,7 +665,7 @@ gs_appstream_refine_app (GsPlugin *plugin,
"requires/id[@type='id']"
"[text()='org.gnome.Software.desktop']", NULL);
if (req != NULL) {
-#if AS_CHECK_VERSION(0,7,15)
+#if AS_CHECK_VERSION(0,7,14)
gint rc = as_utils_vercmp_full (xb_node_get_attr (req, "version"),
PACKAGE_VERSION,
AS_VERSION_COMPARE_FLAG_NONE);
diff --git a/src/gs-update-dialog.c b/src/gs-update-dialog.c
index 553cea3bc..dc19f4def 100644
--- a/src/gs-update-dialog.c
+++ b/src/gs-update-dialog.c
@@ -451,7 +451,7 @@ is_downgrade (const gchar *evr1,
* part of the semantic version */
/* check version */
-#if AS_CHECK_VERSION(0,7,15)
+#if AS_CHECK_VERSION(0,7,14)
rc = as_utils_vercmp_full (version1, version2,
AS_VERSION_COMPARE_FLAG_NONE);
#else
@@ -461,7 +461,7 @@ is_downgrade (const gchar *evr1,
return rc > 0;
/* check release */
-#if AS_CHECK_VERSION(0,7,15)
+#if AS_CHECK_VERSION(0,7,14)
rc = as_utils_vercmp_full (version1, version2,
AS_VERSION_COMPARE_FLAG_NONE);
#else
--
2.19.1

View File

@ -2,7 +2,7 @@
%global gtk3_version 3.22.4
%global json_glib_version 1.2.0
%global packagekit_version 1.1.1
%global appstream_glib_version 0.7.14-3
%global appstream_glib_version 0.7.15
%global libsoup_version 2.52.0
%global gsettings_desktop_schemas_version 3.12.0
%global gnome_desktop_version 3.18.0
@ -19,8 +19,8 @@
%endif
Name: gnome-software
Version: 3.31.90
Release: 4%{?dist}
Version: 3.31.92
Release: 1%{?dist}
Summary: A software center for GNOME
License: GPLv2+
@ -34,10 +34,6 @@ Source1: https://github.com/projectatomic/libdnf/archive/%{commit1}/libdnf-%{s
Provides: bundled(libdnf) = 0.12.1
%endif
# Lower appstream-glib version check as we have the required new API backported to
# libappstream-glib-0.7.14-3.fc29.
Patch0: 0001-Lower-as_utils_vercmp_full-version-check-for-Fedora.patch
BuildRequires: gcc
BuildRequires: gettext
BuildRequires: libxslt
@ -290,6 +286,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_mandir}/man1/gnome-software-editor.1*
%changelog
* Tue Mar 05 2019 Kalev Lember <klember@redhat.com> - 3.31.92-1
- Update to 3.31.92
* Thu Feb 28 2019 Kalev Lember <klember@redhat.com> - 3.31.90-4
- Change PackageKit requires to recommends

View File

@ -1,2 +1,2 @@
SHA512 (gnome-software-3.31.90.tar.xz) = c0116cbd1e0d47f26429f484df16d01b803a91c91f234dcc3e25c2043e17e455ce5c0d14e41242889e0012e05f4a2ad87a050f3d207f24880b626b5cac460f6d
SHA512 (gnome-software-3.31.92.tar.xz) = b9ba8bbc737e0a066b69b3f6a714d3a8cb445b486620edf0058ff489dafc768ee5d6bdaf91c79f1091d21c52bef5e9f9ebd34af0860260eaf741a3061607ace6
SHA512 (libdnf-7ecb2f5.tar.gz) = cf062cb62747fcf428268518f62fa6041ea22cd529397a11fa706790c81638fd155dc8326e6fa70b48873a3d169a7b4dd0ebd10de1227f482553902824fc8573