Hello community,
here is the log from the commit of package gnome-packagekit for openSUSE:Factory
checked in at Thu Apr 1 13:01:21 CEST 2010.
--------
--- GNOME/gnome-packagekit/gnome-packagekit.changes 2009-12-08 13:41:54.000000000 +0100
+++ /mounts/work_src_done/STABLE/gnome-packagekit/gnome-packagekit.changes 2010-03-29 15:36:08.000000000 +0200
@@ -1,0 +2,159 @@
+Mon Mar 29 15:10:47 CEST 2010 - vuntz@opensuse.org
+
+- Update to version 2.30.0:
+ + New Features:
+ - Allow the user to select the GPG key information to be able
+ to verify it
+ - Use libunique to ensure we only ever have one update icon
+ running in the session
+ + Bugfix:
+ - Added and updated screenshots
+ - Check if we got an invalid pixbuf to prevent a crash
+ - Ensure we close the previous dialog before we show an error
+ dialog. Fixes rh#569842
+ - Ensure we remove the timeout source of the auto-closing
+ dialogs. Fixes rh#570436
+ - Fix the error when the user clicks the about menu item
+ - Fix the second install in gpk-update-viewer when a backend is
+ reporting detailed errors
+ - Fix checking for updates every day when the user had
+ specified 'Never'. Fixes rh#544573
+ - Hide the update icon when all updates are blocked
+ - Mark a few menu items translatable
+ - Use gtk_buildable_get_name() rather than
+ gtk_widget_get_name()
+- Rebase gnome-packagekit-fate302445.patch.
+- Rebase gnome-packagekit-BNC383261.patch.
+
+-------------------------------------------------------------------
+Wed Mar 24 02:09:47 CET 2010 - vuntz@opensuse.org
+
+- Update to version 2.29.91:
+ + New Features:
+ - Add InstallPrinterDrivers into the session API
+ + Bugfixes:
+ - Do not assume that we are just installing when we get the
+ simulate request
+ - Do not schedule a refresh-cache if one is already waiting
+ - Do not show '0 bytes' in the confirmation dialog, just show
+ the message title
+ - Do not show the list of packages in the updates-available
+ bubble. Fixes bgo#609233
+ - Ensure parent window is set modal when installing packages
+ with deps using the DBus interface. Fixes rh#566741
+ - Fix an infinite loop in
+ gpk_update_viewer_are_all_updates_selected()
+ - Fixed incorrect use of g_ascii_strdown
+ - If we failed to update the system, wait a lot longer than two
+ seconds before we try again
+ - Read the PkClient error code enum and try to map it to a
+ PkErrorEnum code
+ - Return TRUE when InstallPackageFiles succeeds
+ - Use correct provides tag for postscriptdriver what-provides
+ query
+- Add libgudev-1_0-devel BuildRequires.
+
+-------------------------------------------------------------------
+Fri Feb 12 13:28:05 CET 2010 - vuntz@opensuse.org
+
+- Move the change of gconf schema in gnome-packagekit_release.patch
+ to the gconf2-branding package, and rename
+ gnome-packagekit_release.patch to
+ gnome-packagekit-OnlyShowIn.patch.
+- Drop gnome-packagekit-BNC542819.patch: the logic for patch based
+ updates should be done in PackageKit itself now.
+
+-------------------------------------------------------------------
+Thu Feb 11 15:50:19 CET 2010 - vuntz@opensuse.org
+
+- Update to version 2.29.3:
+ + New Features:
+ - Remove the 'Install only security updates' button from the
+ security updates popup and open the update viewer instead
+ - Show transaction messages in gpk-repo
+ - Show the size of the extra packages that need to be
+ downloaded as deps
+ - Filter by the timespec in gpk-log, not the localised date.
+ Fixes rh#544667
+ - Show internal errors with modal dialogs, rather than just
+ failing quietly with an error on stderr
+ - Nest child updates in the update viewer so we don't show the
+ same update description multiple times
+ + Bugfix:
+ - Fix menu entry capitalisation in gpk-application
+ - Make the security update notification dialog timeout after 15
+ seconds
+ - Ensure we detect and use x11 to fix the compile when linking
+ with --as-needed
+ - Actually cancel the transaction when the GpkWatch cancel
+ button is pressed
+ - Process every transaction finish, even if we're not watching
+ it
+ - Only wait 3 seconds (not 60) when we get the updates changed
+ signal
+ - Re-get the update list in the update viewer if the network
+ state changes. Fixes rh#543871
+ - Fix two potential crashers when gpk-update-viewer has
+ finished applying updates
+ - Don't hide the restart status icon just because the daemon
+ exited. Fixes rh#553966
+ - Fix some i18n bugs. Fixes bgo#606629
+- Update to version 2.29.2:
+ + New Features:
+ - Ensure the gpk-update-icon service is running by activating
+ it if somebody uses the interface. Fixes rh#548095
+ - Split up the DBus interface part of gpk-update-icon into an
+ session-activated gpk-dbus-service binary
+ + Bugfix:
+ - Check the GpkDbusTask object only replies once to each
+ session request
+- Update to version 2.29.1:
+ + New Features:
+ - Convert all the client applications to use packagekit-glib2
+ - When the update viewer is no longer being shown, force an
+ update of the updates
+ - Remove a lot of the helpers and create a GpkTask module that
+ implements PkTask to handle the transaction interactions
+ - Use a GtkInfoBar to display the mobile broadband warning, not
+ a modal dialog box
+ - Add RemovePackageByFile() to match the API provided by
+ KPackageKit
+ - Format the dates in the update viewer according to the users
+ locale. Fixes bgo#601493
+ - Add a GConf key to add program exec names to ignore all DBus
+ requests from. Fixes rh#501023
+ - Make the update viewer cope with multiple packages
+ downloading at the same time
+ - Add a new GConf key to control whether we show all packages
+ in the add/remove UI
+ + Bugfix:
+ - Fix thinko in spinner cell renderer's rendering
+ - Fix duplicate mnemonics in menu. Fixes bgo#601581
+ - Use the correct show-confirm key when installing a font
+ - Some more fixes to the session interface
+ - Don't escape the desktop summary in the run dialog. Fixes
+ bgo#596010
+ - Ignore cleanup and finished packages when we a simulating a
+ remove or install
+ - Never show the role text in the GpkWatch tooltip
+ - Only show 'and n other security updates when there are other
+ updates to list. Fixes rh#527149
+ - Don't show 4Gb as the file size when we actually get -1,
+ meaning percentage unknown
+ - Use seporate messages when we've finished installing all or
+ some of the updates
+ - If command line contains (deleted) the original binary is
+ invalid, and don't show it in the UI. Fixes rh#524873
+ - Don't show finished tasks in the menu dropdown
+ - Run the gpk-install-foo helpers with interaction
+ 'hide-finished,hide-warnings' as we are handling failure
+ - Check we're not already doing GetUpdates or GetDistroUpgrades
+ before we try to do the action
+ - Ensure we use the progress callback to update the UI when
+ processing session DBus requests
+ - Use the desktop icon when we unselect the installed
+ application in gpk-application. Fixes fdo#25098
+- Rebase gnome-packagekit-fate302445.patch.
+- Rebase gnome-packagekit-BNC383261.patch.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
gnome-packagekit-2.28.2.tar.bz2
gnome-packagekit-BNC542819.patch
gnome-packagekit_release.patch
New:
----
gnome-packagekit-2.30.0.tar.bz2
gnome-packagekit-OnlyShowIn.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-packagekit.spec ++++++
--- /var/tmp/diff_new_pack.msgqBI/_old 2010-04-01 12:56:20.000000000 +0200
+++ /var/tmp/diff_new_pack.msgqBI/_new 2010-04-01 12:56:20.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package gnome-packagekit (Version 2.28.2)
+# spec file for package gnome-packagekit (Version 2.30.0)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,17 +19,15 @@
Name: gnome-packagekit
Url: http://packagekit.org/
-Version: 2.28.2
+Version: 2.30.0
Release: 1
License: GPLv2+
Source: %{name}-%{version}.tar.bz2
-Patch1: gnome-packagekit_release.patch
+Patch1: gnome-packagekit-OnlyShowIn.patch
#PATCH-FEATURE-OPENSUSE gnome-packagekit-fate302445.patch fate 302445
Patch3: gnome-packagekit-fate302445.patch
Patch5: gnome-packagekit-BNC383261.patch
Patch6: gnome-packagekit-BNC538353.patch
-#PATCH-FEATURE-OPENSUSE gnome-packagekit-BNC542819.patch sreeves@novell.com -- SUSE updates are patch based, don't try and get dependencies.
-Patch7: gnome-packagekit-BNC542819.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: DeviceKit-power-devel
BuildRequires: PackageKit-devel
@@ -38,15 +36,16 @@
BuildRequires: gconf2-devel
BuildRequires: gettext-devel
BuildRequires: gnome-doc-utils-devel
+BuildRequires: gnome-menus-devel
BuildRequires: gtk2-devel
BuildRequires: intltool
BuildRequires: libcanberra-devel
+BuildRequires: libgudev-1_0-devel
BuildRequires: libnotify-devel
BuildRequires: libunique-devel
BuildRequires: sqlite-devel
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
-BuildRequires: gnome-menus-devel
Requires: gnome-icon-theme
Requires: %{name}-lang = %{version}
Provides: opensuse-updater-gnome = 0.4.7
@@ -64,12 +63,6 @@
There are several utilities designed for installing, updating and
removing packages on your system.
-
-
-Authors:
---------
- Richard Hughes
-
%lang_package
%prep
%setup -q
@@ -78,7 +71,6 @@
%patch3 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
%build
#autoreconf -f -i
@@ -91,7 +83,6 @@
%makeinstall
%find_lang %{name}
%find_gconf_schemas
-cat %{name}.schemas_list >%{name}.lst
%suse_update_desktop_file gpk-repo
%suse_update_desktop_file gpk-log Settings
%suse_update_desktop_file gpk-update-viewer
@@ -117,14 +108,16 @@
%preun -f %{name}.schemas_preun
-%files -f %{name}.lst
+%files -f %{name}.schemas_list
%defattr(-,root,root)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/gpk-*
-%{_datadir}/gnome-packagekit
%{_sysconfdir}/xdg/autostart/gpk-update-icon.desktop
+%{_datadir}/gnome-packagekit/
%{_datadir}/applications/gpk-*.desktop
-%{_datadir}/icons/hicolor/*
+%{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service
+%{_datadir}/icons/hicolor/*/apps/gpk-*.*
+%{_datadir}/icons/hicolor/*/mimetypes/application-*.*
%dir %{python_sitelib}/packagekit
%{python_sitelib}/packagekit/g*
++++++ gnome-packagekit-2.28.2.tar.bz2 -> gnome-packagekit-2.30.0.tar.bz2 ++++++
++++ 294185 lines of diff (skipped)
++++++ gnome-packagekit-BNC383261.patch ++++++
--- /var/tmp/diff_new_pack.msgqBI/_old 2010-04-01 12:56:21.000000000 +0200
+++ /var/tmp/diff_new_pack.msgqBI/_new 2010-04-01 12:56:21.000000000 +0200
@@ -1,42 +1,37 @@
-Index: gnome-packagekit-2.27.92/src/gpk-check-update.c
+Index: gnome-packagekit-2.30.0/src/gpk-check-update.c
===================================================================
---- gnome-packagekit-2.27.92.orig/src/gpk-check-update.c
-+++ gnome-packagekit-2.27.92/src/gpk-check-update.c
-@@ -1264,8 +1264,14 @@ gpk_check_update_error_code_cb (PkClient
- }
-
- /* not modal as we are a status icon */
-- gpk_error_dialog (gpk_error_enum_to_localised_text (code),
-- gpk_error_enum_to_localised_message (code), details);
-+ if (code == PK_ERROR_ENUM_DEP_RESOLUTION_FAILED) {
-+ egg_debug ("DEP_RES failed - will ask if they want to try yast");
-+ gpk_error_dialog_modal_with_time (NULL, gpk_error_enum_to_localised_text (code),
-+ gpk_error_enum_to_localised_message (code), details, 0, TRUE);
+--- gnome-packagekit-2.30.0.orig/src/gpk-check-update.c
++++ gnome-packagekit-2.30.0/src/gpk-check-update.c
+@@ -454,6 +454,11 @@ gpk_check_update_show_error (GpkCheckUpd
+ g_object_unref (cupdate->priv->error_code);
+ cupdate->priv->error_code = g_object_ref (error_code);
+
++ if (error_enum == PK_ERROR_ENUM_DEP_RESOLUTION_FAILED) {
++ gpk_error_dialog_modal_yast (NULL, title, message, pk_error_get_details (error_code));
++ goto out;
+ }
-+ else
-+ gpk_error_dialog (gpk_error_enum_to_localised_text (code),
-+ gpk_error_enum_to_localised_message (code), details);
- out:
- return;
- }
-Index: gnome-packagekit-2.27.92/src/gpk-dbus-task.c
++
+ /* do the bubble */
+ egg_debug ("title=%s, message=%s", title, message);
+ notification = notify_notification_new_with_status_icon (title, message, "help-browser", cupdate->priv->status_icon);
+Index: gnome-packagekit-2.30.0/src/gpk-dbus-task.c
===================================================================
---- gnome-packagekit-2.27.92.orig/src/gpk-dbus-task.c
-+++ gnome-packagekit-2.27.92/src/gpk-dbus-task.c
-@@ -443,7 +443,7 @@ gpk_dbus_task_error_msg (GpkDbusTask *ta
+--- gnome-packagekit-2.30.0.orig/src/gpk-dbus-task.c
++++ gnome-packagekit-2.30.0/src/gpk-dbus-task.c
+@@ -337,7 +337,7 @@ gpk_dbus_task_error_msg (GpkDbusTask *dt
/* hide the main window */
- window = gpk_modal_dialog_get_window (task->priv->dialog);
-- gpk_error_dialog_modal_with_time (window, title, message, details, task->priv->timestamp);
-+ gpk_error_dialog_modal_with_time (window, title, message, details, task->priv->timestamp, FALSE);
+ window = gpk_modal_dialog_get_window (dtask->priv->dialog);
+- gpk_error_dialog_modal_with_time (window, title, message, details, dtask->priv->timestamp);
++ gpk_error_dialog_modal_with_time (window, title, message, details, dtask->priv->timestamp, FALSE);
}
/**
-Index: gnome-packagekit-2.27.92/src/gpk-error.c
+Index: gnome-packagekit-2.30.0/src/gpk-error.c
===================================================================
---- gnome-packagekit-2.27.92.orig/src/gpk-error.c
-+++ gnome-packagekit-2.27.92/src/gpk-error.c
-@@ -34,6 +34,32 @@
+--- gnome-packagekit-2.30.0.orig/src/gpk-error.c
++++ gnome-packagekit-2.30.0/src/gpk-error.c
+@@ -33,6 +33,32 @@
#include "gpk-common.h"
#include "gpk-error.h"
@@ -45,12 +40,12 @@
+{
+ gboolean retval;
+ GError *error = NULL;
-+
++
+ PkControl *control = pk_control_new ();
-+ if (!pk_control_suggest_daemon_quit(control, &error))
++ if (!pk_control_suggest_daemon_quit(control, NULL, &error))
+ egg_debug ("Failure calling pk_control_suggest_daemon_quit:%s", error->message);
+ g_object_unref (control);
-+
++
+ retval = g_spawn_command_line_async ("gnomesu -- /sbin/yast2 online_update", NULL);
+ if (!retval)
+ egg_debug ("Failure launching yast2 online_update");
@@ -69,7 +64,7 @@
/**
* gpk_error_dialog_expanded_cb:
**/
-@@ -62,13 +88,15 @@ gpk_error_dialog_expanded_cb (GObject *o
+@@ -61,13 +87,15 @@ gpk_error_dialog_expanded_cb (GObject *o
* Shows a modal error, and blocks until the user clicks close
**/
gboolean
@@ -86,7 +81,7 @@
g_return_val_if_fail (message != NULL, FALSE);
-@@ -111,8 +139,22 @@ gpk_error_dialog_modal_with_time (GtkWin
+@@ -110,8 +138,22 @@ gpk_error_dialog_modal_with_time (GtkWin
gtk_label_set_label (GTK_LABEL (widget), title);
/* message */
@@ -109,46 +104,116 @@
+ g_free (full_message);
/* show text in the expander */
- if (egg_strzero (details)) {
-@@ -156,7 +198,7 @@ out_build:
+ if (details == NULL || details[0] == '\0') {
+@@ -155,7 +197,13 @@ out_build:
gboolean
gpk_error_dialog_modal (GtkWindow *window, const gchar *title, const gchar *message, const gchar *details)
{
- return gpk_error_dialog_modal_with_time (window, title, message, details, 0);
+ return gpk_error_dialog_modal_with_time (window, title, message, details, 0, FALSE);
++}
++
++gboolean
++gpk_error_dialog_modal_yast (GtkWindow *window, const gchar *title, const gchar *message, const gchar *details)
++{
++ return gpk_error_dialog_modal_with_time (window, title, message, details, 0, TRUE);
}
/**
-Index: gnome-packagekit-2.27.92/src/gpk-error.h
+Index: gnome-packagekit-2.30.0/src/gpk-error.h
===================================================================
---- gnome-packagekit-2.27.92.orig/src/gpk-error.h
-+++ gnome-packagekit-2.27.92/src/gpk-error.h
-@@ -37,7 +37,8 @@ gboolean gpk_error_dialog_modal_with_ti
+--- gnome-packagekit-2.30.0.orig/src/gpk-error.h
++++ gnome-packagekit-2.30.0/src/gpk-error.h
+@@ -37,7 +37,12 @@ gboolean gpk_error_dialog_modal_with_ti
const gchar *title,
const gchar *message,
const gchar *details,
- guint timestamp);
+ guint timestamp,
-+ gboolean prompt_yast);
++ gboolean prompt_yast);
++gboolean gpk_error_dialog_modal_yast (GtkWindow *window,
++ const gchar *title,
++ const gchar *message,
++ const gchar *details);
G_END_DECLS
-Index: gnome-packagekit-2.27.92/src/gpk-update-viewer.c
+Index: gnome-packagekit-2.30.0/src/gpk-update-viewer.c
===================================================================
---- gnome-packagekit-2.27.92.orig/src/gpk-update-viewer.c
-+++ gnome-packagekit-2.27.92/src/gpk-update-viewer.c
-@@ -2159,7 +2159,13 @@ gpk_update_viewer_error_code_cb (PkClien
+--- gnome-packagekit-2.30.0.orig/src/gpk-update-viewer.c
++++ gnome-packagekit-2.30.0/src/gpk-update-viewer.c
+@@ -487,8 +487,12 @@ gpk_update_viewer_update_packages_cb (Pk
+ CA_PROP_EVENT_DESCRIPTION, _("Failed to update"), NULL);
+
+ window = GTK_WINDOW(gtk_builder_get_object (priv->builder, "dialog_updates"));
+- gpk_error_dialog_modal (window, gpk_error_enum_to_localised_text (pk_error_get_code (error_code)),
+- gpk_error_enum_to_localised_message (pk_error_get_code (error_code)), pk_error_get_details (error_code));
++ if (pk_error_get_code (error_code) == PK_ERROR_ENUM_DEP_RESOLUTION_FAILED) {
++ gpk_error_dialog_modal_yast (window, gpk_error_enum_to_localised_text (pk_error_get_code (error_code)),
++ gpk_error_enum_to_localised_message (pk_error_get_code (error_code)), pk_error_get_details (error_code));
++ } else
++ gpk_error_dialog_modal (window, gpk_error_enum_to_localised_text (pk_error_get_code (error_code)),
++ gpk_error_enum_to_localised_message (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+
+ /* re-enable the package list */
+ gpk_update_viewer_packages_set_sensitive (update_viewer, TRUE);
+@@ -2098,8 +2102,12 @@ gpk_update_viewer_get_details_cb (PkClie
+ egg_warning ("failed to get details: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+
+ window = GTK_WINDOW(gtk_builder_get_object (priv->builder, "dialog_updates"));
+- gpk_error_dialog_modal (window, gpk_error_enum_to_localised_text (pk_error_get_code (error_code)),
+- gpk_error_enum_to_localised_message (pk_error_get_code (error_code)), pk_error_get_details (error_code));
++ if (pk_error_get_code (error_code) == PK_ERROR_ENUM_DEP_RESOLUTION_FAILED) {
++ gpk_error_dialog_modal_yast (window, gpk_error_enum_to_localised_text (pk_error_get_code (error_code)),
++ gpk_error_enum_to_localised_message (pk_error_get_code (error_code)), pk_error_get_details (error_code));
++ } else
++ gpk_error_dialog_modal (window, gpk_error_enum_to_localised_text (pk_error_get_code (error_code)),
++ gpk_error_enum_to_localised_message (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ goto out;
}
- window = GTK_WINDOW (gtk_builder_get_object (builder, "dialog_updates"));
-- gpk_error_dialog_modal (window, gpk_error_enum_to_localised_text (code),
-+ if (code == PK_ERROR_ENUM_DEP_RESOLUTION_FAILED) {
-+ egg_debug ("DEP_RES failed - will ask if they want to try yast");
-+ gpk_error_dialog_modal_with_time (window, gpk_error_enum_to_localised_text (code),
-+ gpk_error_enum_to_localised_message (code), details, 0, TRUE);
-+ }
-+ else
-+ gpk_error_dialog_modal (window, gpk_error_enum_to_localised_text (code),
- gpk_error_enum_to_localised_message (code), details);
- }
+@@ -2197,8 +2205,12 @@ gpk_update_viewer_get_update_detail_cb (
+ egg_warning ("failed to get update details: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+
+ window = GTK_WINDOW(gtk_builder_get_object (priv->builder, "dialog_updates"));
+- gpk_error_dialog_modal (window, gpk_error_enum_to_localised_text (pk_error_get_code (error_code)),
+- gpk_error_enum_to_localised_message (pk_error_get_code (error_code)), pk_error_get_details (error_code));
++ if (pk_error_get_code (error_code) == PK_ERROR_ENUM_DEP_RESOLUTION_FAILED) {
++ gpk_error_dialog_modal_yast (window, gpk_error_enum_to_localised_text (pk_error_get_code (error_code)),
++ gpk_error_enum_to_localised_message (pk_error_get_code (error_code)), pk_error_get_details (error_code));
++ } else
++ gpk_error_dialog_modal (window, gpk_error_enum_to_localised_text (pk_error_get_code (error_code)),
++ gpk_error_enum_to_localised_message (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ goto out;
+ }
+
+@@ -2582,8 +2594,12 @@ gpk_update_viewer_get_updates_cb (PkClie
+ egg_warning ("failed to get updates: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+
+ window = GTK_WINDOW(gtk_builder_get_object (priv->builder, "dialog_updates"));
+- gpk_error_dialog_modal (window, gpk_error_enum_to_localised_text (pk_error_get_code (error_code)),
+- gpk_error_enum_to_localised_message (pk_error_get_code (error_code)), pk_error_get_details (error_code));
++ if (pk_error_get_code (error_code) == PK_ERROR_ENUM_DEP_RESOLUTION_FAILED) {
++ gpk_error_dialog_modal_yast (window, gpk_error_enum_to_localised_text (pk_error_get_code (error_code)),
++ gpk_error_enum_to_localised_message (pk_error_get_code (error_code)), pk_error_get_details (error_code));
++ } else
++ gpk_error_dialog_modal (window, gpk_error_enum_to_localised_text (pk_error_get_code (error_code)),
++ gpk_error_enum_to_localised_message (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ goto out;
+ }
+
+@@ -2994,8 +3010,12 @@ gpk_update_viewer_get_distro_upgrades_cb
+ egg_warning ("failed to get list of distro upgrades: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+
+ window = GTK_WINDOW(gtk_builder_get_object (priv->builder, "dialog_updates"));
+- gpk_error_dialog_modal (window, gpk_error_enum_to_localised_text (pk_error_get_code (error_code)),
+- gpk_error_enum_to_localised_message (pk_error_get_code (error_code)), pk_error_get_details (error_code));
++ if (pk_error_get_code (error_code) == PK_ERROR_ENUM_DEP_RESOLUTION_FAILED) {
++ gpk_error_dialog_modal_yast (window, gpk_error_enum_to_localised_text (pk_error_get_code (error_code)),
++ gpk_error_enum_to_localised_message (pk_error_get_code (error_code)), pk_error_get_details (error_code));
++ } else
++ gpk_error_dialog_modal (window, gpk_error_enum_to_localised_text (pk_error_get_code (error_code)),
++ gpk_error_enum_to_localised_message (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ goto out;
+ }
++++++ gnome-packagekit-OnlyShowIn.patch ++++++
--- gnome-packagekit-0.3.0/data/gpk-application.desktop.in
+++ gnome-packagekit-0.3.0/data/gpk-application.desktop.in
@@ -8,6 +8,6 @@
Terminal=false
Type=Application
Categories=GNOME;GTK;System;Settings;
-NotShowIn=KDE;
+OnlyShowIn=GNOME;
StartupNotify=true
--- gnome-packagekit-0.3.0/data/gpk-log.desktop.in
+++ gnome-packagekit-0.3.0/data/gpk-log.desktop.in
@@ -8,5 +8,6 @@
Terminal=false
Type=Application
Categories=GNOME;GTK;System;X-Red-Hat-Base;
+OnlyShowIn=GNOME;
StartupNotify=true
--- gnome-packagekit-0.3.0/data/gpk-prefs.desktop.in
+++ gnome-packagekit-0.3.0/data/gpk-prefs.desktop.in
@@ -8,6 +8,6 @@
Terminal=false
Type=Application
Categories=Settings;X-GNOME-SystemSettings;
-NotShowIn=KDE;
+OnlyShowIn=GNOME;
StartupNotify=true
--- gnome-packagekit-0.3.0/data/gpk-repo.desktop.in
+++ gnome-packagekit-0.3.0/data/gpk-repo.desktop.in
@@ -8,6 +8,6 @@
Terminal=false
Type=Application
Categories=GNOME;GTK;System;Settings;
-NotShowIn=KDE;
+OnlyShowIn=GNOME;
StartupNotify=true
--- gnome-packagekit-0.3.0/data/gpk-update-viewer.desktop.in
+++ gnome-packagekit-0.3.0/data/gpk-update-viewer.desktop.in
@@ -8,6 +8,6 @@
Terminal=false
Type=Application
Categories=GNOME;GTK;Settings;System;PackageManager;
-NotShowIn=KDE
+OnlyShowIn=GNOME;
StartupNotify=true
--- gnome-packagekit-0.3.7/data/gpk-service-pack.desktop.in
+++ gnome-packagekit-0.3.7/data/gpk-service-pack.desktop.in
@@ -9,4 +9,5 @@
Type=Application
Categories=GNOME;GTK;System;X-Red-Hat-Base;
StartupNotify=true
+OnlyShowIn=GNOME;
++++++ gnome-packagekit-fate302445.patch ++++++
--- /var/tmp/diff_new_pack.msgqBI/_old 2010-04-01 12:56:21.000000000 +0200
+++ /var/tmp/diff_new_pack.msgqBI/_new 2010-04-01 12:56:21.000000000 +0200
@@ -1,34 +1,27 @@
-Index: gnome-packagekit-2.27.5/src/gpk-update-icon.c
+Index: gnome-packagekit-2.30.0/src/gpk-update-icon.c
===================================================================
---- gnome-packagekit-2.27.5.orig/src/gpk-update-icon.c
-+++ gnome-packagekit-2.27.5/src/gpk-update-icon.c
-@@ -31,9 +31,11 @@
- #include
- #include
+--- gnome-packagekit-2.30.0.orig/src/gpk-update-icon.c
++++ gnome-packagekit-2.30.0/src/gpk-update-icon.c
+@@ -33,9 +33,11 @@
#include
+ #include
+ #include
+#include
- #include
#include "egg-debug.h"
-+#include "egg-string.h"
#include "egg-dbus-monitor.h"
++#include "egg-string.h"
#include "gpk-check-update.h"
-@@ -44,6 +46,10 @@
- #include "org.freedesktop.PackageKit.h"
+ #include "gpk-watch.h"
+@@ -43,6 +45,88 @@
+ #include "gpk-hardware.h"
#include "gpk-common.h"
+#define GPK_CONF_HARDWARE_ASKED_TO_COLLECT "/apps/gnome-packagekit/updater_asked_to_collect_hardware_information"
+#define GPK_UPDATE_HARDWARE_SEND_ACTION "gpk-update-icon hardware info - send "
+#define GPK_UPDATE_HARDWARE_DONT_PROMPT_ACTION "gpk-update-icon hardware info - don't ask again"
+
- /**
- * gpk_object_register:
- * @connection: What we want to register to
-@@ -103,6 +109,84 @@ pk_dbus_connection_replaced_cb (EggDbusM
- gtk_main_quit ();
- }
-
+static void
+gpk_update_libnotify_cb (NotifyNotification *notification, gchar *action, gpointer data)
+{
@@ -110,12 +103,12 @@
/**
* main:
**/
-@@ -168,6 +252,8 @@ main (int argc, char *argv[])
- return 1;
- }
+@@ -123,6 +207,8 @@ main (int argc, char *argv[])
+ /* Only timeout if we have specified iton the command line */
+ if (timed_exit)
+ g_timeout_add_seconds (120, (GSourceFunc) gtk_main_quit, NULL);
++ else
++ g_timeout_add_seconds (5 * 60, check_for_collect_hardware_information, NULL);
-+ g_timeout_add_seconds (5 * 60, check_for_collect_hardware_information, NULL);
-+
- /* add application specific icons to search path */
- gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
- GPK_DATA G_DIR_SEPARATOR_S "icons");
+ /* wait */
+ gtk_main ();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org