diff --git a/.gitignore b/.gitignore index 5c9f109..bb90c9d 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /gnome-software-3.15.2.tar.xz /gnome-software-3.15.4.tar.xz /gnome-software-3.15.90.tar.xz +/gnome-software-3.15.91.tar.xz diff --git a/0001-PK-session-service-Export-our-own-name-as-a-property.patch b/0001-PK-session-service-Export-our-own-name-as-a-property.patch deleted file mode 100644 index 2169fda..0000000 --- a/0001-PK-session-service-Export-our-own-name-as-a-property.patch +++ /dev/null @@ -1,65 +0,0 @@ -From a9fd0d669b784426302f4b213f58a6b12c921f34 Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Tue, 17 Feb 2015 13:56:32 +0100 -Subject: [PATCH] PK session service: Export our own name as a property - -Export our own localized name as a DisplayName property so that other -apps could use it when displaying user facing strings. ---- - src/gs-dbus-helper.c | 11 +++++++++++ - src/org.freedesktop.PackageKit.Modify2.xml | 11 +++++++++++ - 2 files changed, 22 insertions(+) - -diff --git a/src/gs-dbus-helper.c b/src/gs-dbus-helper.c -index a960981..9071367 100644 ---- a/src/gs-dbus-helper.c -+++ b/src/gs-dbus-helper.c -@@ -685,6 +685,7 @@ bus_gotten_cb (GObject *source_object, - { - GsDbusHelper *dbus_helper = GS_DBUS_HELPER (user_data); - _cleanup_object_unref_ GDBusConnection *connection = NULL; -+ _cleanup_object_unref_ GDesktopAppInfo *app_info = NULL; - _cleanup_error_free_ GError *error = NULL; - - connection = g_bus_get_finish (res, &error); -@@ -758,6 +759,16 @@ bus_gotten_cb (GObject *source_object, - g_signal_connect (dbus_helper->modify2_interface, "handle-install-printer-drivers", - G_CALLBACK (handle_modify2_install_printer_drivers), dbus_helper); - -+ /* Look up our own localized name and export it as a property on the bus */ -+ app_info = g_desktop_app_info_new ("org.gnome.Software.desktop"); -+ if (app_info != NULL) { -+ const gchar *app_name = g_app_info_get_name (G_APP_INFO (app_info)); -+ if (app_name != NULL) -+ g_object_set (G_OBJECT (dbus_helper->modify2_interface), -+ "display-name", app_name, -+ NULL); -+ } -+ - if (!g_dbus_interface_skeleton_export (dbus_helper->modify2_interface, - connection, - "/org/freedesktop/PackageKit", -diff --git a/src/org.freedesktop.PackageKit.Modify2.xml b/src/org.freedesktop.PackageKit.Modify2.xml -index f320750..5d9f8a8 100644 ---- a/src/org.freedesktop.PackageKit.Modify2.xml -+++ b/src/org.freedesktop.PackageKit.Modify2.xml -@@ -527,5 +527,16 @@ - - - -+ -+ -+ -+ -+ -+ Translated, human readable name of the program implementing the interface, e.g. 'Software' for gnome-software. -+ -+ -+ -+ -+ - - --- -2.3.0 - diff --git a/0001-extras-Fix-a-crash-when-reloading-the-page.patch b/0001-extras-Fix-a-crash-when-reloading-the-page.patch deleted file mode 100644 index d0c4e1f..0000000 --- a/0001-extras-Fix-a-crash-when-reloading-the-page.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 02ae8c3193aa6bdd459fdf5382a48f38d83ae33e Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Thu, 19 Feb 2015 22:22:46 +0100 -Subject: [PATCH] extras: Fix a crash when reloading the page - -Make gs_shell_extras_reload() a noop when we have no contents for the -page. - -Thanks to Rafal Luzynski for spotting this! ---- - src/gs-shell-extras.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/gs-shell-extras.c b/src/gs-shell-extras.c -index cdd8211..474bf27 100644 ---- a/src/gs-shell-extras.c -+++ b/src/gs-shell-extras.c -@@ -721,7 +721,8 @@ gs_shell_extras_load (GsShellExtras *shell_extras, GPtrArray *array_search_data) - void - gs_shell_extras_reload (GsShellExtras *shell_extras) - { -- gs_shell_extras_load (shell_extras, NULL); -+ if (priv->array_search_data != NULL) -+ gs_shell_extras_load (shell_extras, NULL); - } - - static void --- -2.3.0 - -From fae08193f7e4eb1f9930bdca2d856683660e8c74 Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Thu, 19 Feb 2015 22:32:57 +0100 -Subject: [PATCH] Fix the build - ---- - src/gs-shell-extras.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/gs-shell-extras.c b/src/gs-shell-extras.c -index 474bf27..349a788 100644 ---- a/src/gs-shell-extras.c -+++ b/src/gs-shell-extras.c -@@ -721,6 +721,8 @@ gs_shell_extras_load (GsShellExtras *shell_extras, GPtrArray *array_search_data) - void - gs_shell_extras_reload (GsShellExtras *shell_extras) - { -+ GsShellExtrasPrivate *priv = shell_extras->priv; -+ - if (priv->array_search_data != NULL) - gs_shell_extras_load (shell_extras, NULL); - } --- -2.3.0 - diff --git a/gnome-software.spec b/gnome-software.spec index 36aef1a..c939e81 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -1,13 +1,13 @@ %global glib2_version 2.39.1 %global gtk3_version 3.14.1 %global packagekit_version 1.0.0 -%global appstream_glib_version 0.3.2 +%global appstream_glib_version 0.3.4 %global gsettings_desktop_schemas_version 3.11.5 Summary: A software center for GNOME Name: gnome-software -Version: 3.15.90 -Release: 3%{?dist} +Version: 3.15.91 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: https://wiki.gnome.org/Apps/Software @@ -15,9 +15,6 @@ Source0: http://download.gnome.org/sources/gnome-software/3.15/%{name}-%{versi # Downstream patch to the list of unremovable system apps Patch0: gnome-software-system-apps.patch -# Backported upstream patches -Patch1: 0001-extras-Fix-a-crash-when-reloading-the-page.patch -Patch2: 0001-PK-session-service-Export-our-own-name-as-a-property.patch Requires: appstream-data %if 0%{?fedora} @@ -54,8 +51,6 @@ and update software in the GNOME desktop. %prep %setup -q %patch0 -p1 -b .system-apps -%patch1 -p1 -%patch2 -p1 %build %configure --disable-static @@ -114,6 +109,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/gnome-software/modulesets.d/*.xml %changelog +* Mon Mar 02 2015 Kalev Lember - 3.15.91-1 +- Update to 3.15.91 + * Sat Feb 21 2015 Kalev Lember - 3.15.90-3 - Export DisplayName property on the packagekit session service diff --git a/sources b/sources index 9545163..ac63674 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9927af4bef5d4f52e24ab005996fc5d0 gnome-software-3.15.90.tar.xz +c629eb56a9576fcaf17981a3b5416484 gnome-software-3.15.91.tar.xz