Hello community,
here is the log from the commit of package gnome-packagekit
checked in at Thu Jul 31 02:09:07 CEST 2008.
--------
--- GNOME/gnome-packagekit/gnome-packagekit.changes 2008-06-06 22:26:29.000000000 +0200
+++ /mounts/work_src_done/STABLE/gnome-packagekit/gnome-packagekit.changes 2008-07-29 18:30:59.057516000 +0200
@@ -1,0 +2,26 @@
+Tue Jul 29 18:38:20 CEST 2008 - jpr@suse.de
+
+- Remove %post action and script, it is not needed for factory
+
+-------------------------------------------------------------------
+Fri Jul 18 19:17:28 CEST 2008 - sreeves@suse.de
+
+- Move to 0.2.3
+ add support for installing catalogs
+ rework the gpk-application gui
+ Don't allow the GTK tools to be run as the root user
+ Allow users to install and remove multiple packages using gpk-application
+ Give the user a chance to update only the security updates.
+
+-------------------------------------------------------------------
+Fri Jun 27 03:12:57 CEST 2008 - sreeves@suse.de
+
+- More work for BNC#401057 - better loop handling
+
+-------------------------------------------------------------------
+Wed Jun 18 02:40:35 CEST 2008 - sreeves@suse.de
+
+- Fix for BNC#401057 - better loop handling
+ swampid for this - 18244
+
+-------------------------------------------------------------------
Old:
----
gnome-packagekit-0.2.1.tar.bz2
gnome-packagekit-openSUSE-branch.patch
New:
----
gnome-packagekit-0.2.3.tar.bz2
gnome-packagekit-0.2.3-to-git20080717.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-packagekit.spec ++++++
--- /var/tmp/diff_new_pack.x12383/_old 2008-07-31 02:08:55.000000000 +0200
+++ /var/tmp/diff_new_pack.x12383/_new 2008-07-31 02:08:55.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package gnome-packagekit (Version 0.2.1)
+# spec file for package gnome-packagekit (Version 0.2.3)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,16 +12,16 @@
Name: gnome-packagekit
Url: http://packagekit.org/
-Version: 0.2.1
-Release: 18
+Version: 0.2.3
+Release: 1
License: GPL v2 or later
Source: %{name}-%{version}.tar.bz2
#the .po files from https://forgesvn1.novell.com/viewsvn/suse-i18n/trunk/lcn/
Source1: %{name}-po.tar.gz
-Patch: gnome-packagekit_release.patch
+Patch0: gnome-packagekit-0.2.3-to-git20080717.patch
+Patch1: gnome-packagekit_release.patch
#PATCH-FEATURE-OPENSUSE gnome-packagekit-fate303359.patch fate 303359
Patch2: gnome-packagekit-fate303359.patch
-Patch3: gnome-packagekit-openSUSE-branch.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: PackageKit-devel PolicyKit-gnome-devel cairo-devel dbus-1-devel desktop-file-utils gconf2-devel gettext-devel gnome-doc-utils-devel gtk-doc gtk2-devel intltool libglade2-devel libnotify-devel libsexy-devel libtool sqlite-devel update-desktop-files
Requires: gnome-icon-theme
@@ -46,9 +46,9 @@
%lang_package
%prep
%setup -q -n %{name}-%{version}
-%patch -p1
-%patch2 -p1
-%patch3 -p1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p0
#replace the old po files with lcn ones
rm po/*.po
rm po/LINGUAS
@@ -57,6 +57,7 @@
for filename in `ls *.po`; do echo "$filename"; done > LINGUAS
sed -i s/\.po// LINGUAS
cd ..
+cp -f %{S:2} .
%build
autoreconf -f -i
@@ -76,6 +77,9 @@
%suse_update_desktop_file gpk-prefs X-SuSE-ControlCenter-System
%suse_update_desktop_file $RPM_BUILD_ROOT/usr/share/gnome/autostart/gpk-update-icon.desktop
%suse_update_desktop_file gpk-install-file
+mkdir $RPM_BUILD_ROOT/usr/sbin
+cp -f restart-gpk-update-icon.sh $RPM_BUILD_ROOT/usr/sbin/
+chmod 755 $RPM_BUILD_ROOT/usr/sbin/restart-gpk-update-icon.sh
%clean
rm -rf "$RPM_BUILD_ROOT"
@@ -95,10 +99,25 @@
%{_datadir}/applications/gpk-*.desktop
%{_datadir}/icons/hicolor/*
%{_sysconfdir}/gconf/schemas/gnome-packagekit.schemas
+%{_sbindir}/restart-gpk-update-icon.sh
%files lang -f %{name}.lang
%changelog
+* Tue Jul 29 2008 jpr@suse.de
+- Remove %%post action and script, it is not needed for factory
+* Fri Jul 18 2008 sreeves@suse.de
+- Move to 0.2.3
+ add support for installing catalogs
+ rework the gpk-application gui
+ Don't allow the GTK tools to be run as the root user
+ Allow users to install and remove multiple packages using gpk-application
+ Give the user a chance to update only the security updates.
+* Fri Jun 27 2008 sreeves@suse.de
+- More work for BNC#401057 - better loop handling
+* Wed Jun 18 2008 sreeves@suse.de
+- Fix for BNC#401057 - better loop handling
+ swampid for this - 18244
* Sat Jun 07 2008 sreeves@suse.de
- Fix for BNC#390658 - don't show dialog again if they decline to run.
* Fri Jun 06 2008 sreeves@suse.de
++++++ gnome-packagekit-0.2.1.tar.bz2 -> gnome-packagekit-0.2.3.tar.bz2 ++++++
++++ 52718 lines of diff (skipped)
++++++ gnome-packagekit-0.2.3-to-git20080717.patch ++++++
diff --git a/src/gpk-animated-icon.c b/src/gpk-animated-icon.c
index 4166df3..058fa59 100644
--- a/src/gpk-animated-icon.c
+++ b/src/gpk-animated-icon.c
@@ -123,6 +123,9 @@ gpk_animated_icon_set_filename_tile (GpkAnimatedIcon *icon, GtkIconSize size, co
static gboolean
gpk_animated_icon_update (GpkAnimatedIcon *icon)
{
+ /* debug so we can catch polling */
+ pk_debug ("polling check");
+
/* have we loaded a file */
if (icon->frames == NULL) {
pk_warning ("no frames to process");
@@ -191,11 +194,11 @@ gpk_animated_icon_enable_animation (GpkAnimatedIcon *icon, gboolean enabled)
}
/**
- * gpk_image_finalize:
- * @object: The object to finalize
+ * gpk_animated_icon_destroy:
+ * @object: The object to destroy
**/
static void
-gpk_image_finalize (GObject *object)
+gpk_animated_icon_destroy (GtkObject *object)
{
GpkAnimatedIcon *icon;
icon = GPK_ANIMATED_ICON (object);
@@ -207,15 +210,15 @@ gpk_image_finalize (GObject *object)
g_free (icon->filename);
gpk_animated_icon_free_pixbufs (icon);
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ GTK_OBJECT_CLASS (parent_class)->destroy (object);
}
static void
gpk_animated_icon_class_init (GpkAnimatedIconClass *class)
{
GtkImageClass *image_class;
- GObjectClass *object_class = G_OBJECT_CLASS (class);
- object_class->finalize = gpk_image_finalize;
+ GtkObjectClass *object_class = GTK_OBJECT_CLASS (class);
+ object_class->destroy = gpk_animated_icon_destroy;
parent_class = g_type_class_peek_parent (class);
image_class = GTK_IMAGE_CLASS (class);
diff --git a/src/gpk-auto-refresh.c b/src/gpk-auto-refresh.c
index e8c711a..de18971 100644
--- a/src/gpk-auto-refresh.c
+++ b/src/gpk-auto-refresh.c
@@ -380,6 +380,9 @@ gpk_auto_refresh_timeout_cb (gpointer user_data)
g_return_val_if_fail (GPK_IS_AUTO_REFRESH (arefresh), FALSE);
+ /* debug so we can catch polling */
+ pk_debug ("polling check");
+
/* triggered once an hour */
gpk_auto_refresh_change_state (arefresh);
@@ -397,6 +400,9 @@ gpk_auto_refresh_check_delay_cb (gpointer user_data)
g_return_val_if_fail (GPK_IS_AUTO_REFRESH (arefresh), FALSE);
+ /* debug so we can catch polling */
+ pk_debug ("polling check");
+
/* we have waited enough */
if (arefresh->priv->session_delay == FALSE) {
pk_debug ("setting session delay TRUE");
diff --git a/src/gpk-check-update.c b/src/gpk-check-update.c
index e731d56..8530401 100644
--- a/src/gpk-check-update.c
+++ b/src/gpk-check-update.c
@@ -286,6 +286,10 @@ static gboolean
gpk_check_update_get_updates_post_update_cb (GpkCheckUpdate *cupdate)
{
g_return_val_if_fail (GPK_IS_CHECK_UPDATE (cupdate), FALSE);
+
+ /* debug so we can catch polling */
+ pk_debug ("polling check");
+
gpk_check_update_query_updates (cupdate);
return FALSE;
}
diff --git a/src/gpk-client-run.c b/src/gpk-client-run.c
index 8eb536b..599289a 100644
--- a/src/gpk-client-run.c
+++ b/src/gpk-client-run.c
@@ -325,12 +325,6 @@ gpk_client_run_show (gchar **package_ids)
goto out;
}
- /* just one, so shortcut the UI */
- if (len == 1) {
- full_path = g_strdup (last_tryexec);
- goto out;
- }
-
/* show window */
widget = glade_xml_get_widget (glade_xml, "window_simple");
gtk_widget_show (widget);
diff --git a/src/gpk-client-untrusted.c b/src/gpk-client-untrusted.c
index 6ca5aaa..32a14a7 100644
--- a/src/gpk-client-untrusted.c
+++ b/src/gpk-client-untrusted.c
@@ -115,7 +115,6 @@ gpk_client_untrusted_show (PkErrorCodeEnum code)
button = polkit_gnome_action_create_button (update_system_action);
widget = glade_xml_get_widget (glade_xml, "hbuttonbox2");
gtk_box_pack_start (GTK_BOX (widget), button, FALSE, FALSE, 0);
- gtk_box_reorder_child (GTK_BOX (widget), button, 0);
/* show window */
widget = glade_xml_get_widget (glade_xml, "window_error");
diff --git a/src/gpk-client.c b/src/gpk-client.c
index 649e3b2..f32b52e 100644
--- a/src/gpk-client.c
+++ b/src/gpk-client.c
@@ -61,6 +61,7 @@
static void gpk_client_class_init (GpkClientClass *klass);
static void gpk_client_init (GpkClient *gclient);
static void gpk_client_finalize (GObject *object);
+static void gpk_client_done (GpkClient *gclient);
#define GPK_CLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPK_TYPE_CLIENT, GpkClientPrivate))
#define PK_STOCK_WINDOW_ICON "system-software-installer"
@@ -223,6 +224,7 @@ gpk_client_updates_button_close_cb (GtkWidget *widget_button, GpkClient *gclient
/* go! */
widget = glade_xml_get_widget (gclient->priv->glade_xml, "window_updates");
gtk_widget_hide (widget);
+ gpk_client_done (gclient);
g_signal_emit (gclient, signals [GPK_CLIENT_QUIT], 0);
}
@@ -258,6 +260,9 @@ gpk_install_finished_timeout (gpointer data)
GtkWidget *widget;
GpkClient *gclient = (GpkClient *) data;
+ /* debug so we can catch polling */
+ pk_debug ("polling check");
+
/* hide window manually to get it out of the way */
widget = glade_xml_get_widget (gclient->priv->glade_xml, "window_updates");
gtk_widget_hide (widget);
@@ -446,13 +451,16 @@ static void
gpk_client_finished_cb (PkClient *client, PkExitEnum exit, guint runtime, GpkClient *gclient)
{
GtkWidget *widget;
- PkRoleEnum role;
+ PkRoleEnum role = PK_ROLE_ENUM_UNKNOWN;
g_return_if_fail (GPK_IS_CLIENT (gclient));
/* save this so we can return a proper error value */
gclient->priv->exit = exit;
+ /* stop timers, animations and that sort of thing */
+ gpk_client_done (gclient);
+
pk_client_get_role (client, &role, NULL, NULL);
/* do nothing */
if (role == PK_ROLE_ENUM_GET_UPDATES) {
@@ -496,6 +504,9 @@ gpk_client_pulse_progress (GpkClient *gclient)
g_return_val_if_fail (GPK_IS_CLIENT (gclient), FALSE);
+ /* debug so we can catch polling */
+ pk_debug ("polling check");
+
widget = glade_xml_get_widget (gclient->priv->glade_xml, "progressbar_percent");
gtk_progress_bar_pulse (GTK_PROGRESS_BAR (widget));
return TRUE;
@@ -898,7 +909,11 @@ gpk_client_install_local_files_internal (GpkClient *gclient, gboolean trusted,
static void
gpk_client_done (GpkClient *gclient)
{
+ GtkWidget *widget;
+
/* we're done */
+ widget = glade_xml_get_widget (gclient->priv->glade_xml, "image_status");
+ gpk_animated_icon_enable_animation (GPK_ANIMATED_ICON (widget), FALSE);
if (gclient->priv->pulse_timer_id != 0) {
g_source_remove (gclient->priv->pulse_timer_id);
gclient->priv->pulse_timer_id = 0;
@@ -1075,9 +1090,8 @@ gpk_client_install_local_files (GpkClient *gclient, gchar **files_rel, GError **
/* fail the transaction and set the correct error */
ret = gpk_client_set_error_from_exit_enum (gclient->priv->exit, error);
- /* we're done */
- gpk_client_done (gclient);
out:
+ gpk_client_done (gclient);
return ret;
}
@@ -1162,9 +1176,8 @@ skip_checks:
/* fail the transaction and set the correct error */
ret = gpk_client_set_error_from_exit_enum (gclient->priv->exit, error);
- /* we're done */
- gpk_client_done (gclient);
out:
+ gpk_client_done (gclient);
return ret;
}
@@ -1259,9 +1272,8 @@ skip_checks:
/* fail the transaction and set the correct error */
ret = gpk_client_set_error_from_exit_enum (gclient->priv->exit, error);
- /* we're done */
- gpk_client_done (gclient);
out:
+ gpk_client_done (gclient);
return ret;
}
@@ -2280,6 +2292,7 @@ gpk_client_monitor_tid (GpkClient *gclient, const gchar *tid)
gpk_client_set_page (gclient, GPK_CLIENT_PAGE_PROGRESS);
gpk_client_main_wait (gclient);
+ gpk_client_done (gclient);
return TRUE;
}
diff --git a/src/gpk-firmware.c b/src/gpk-firmware.c
index 8d85021..68a164d 100644
--- a/src/gpk-firmware.c
+++ b/src/gpk-firmware.c
@@ -105,6 +105,9 @@ gpk_firmware_timeout_cb (gpointer data)
GpkFirmware *firmware = GPK_FIRMWARE (data);
NotifyNotification *notification;
+ /* debug so we can catch polling */
+ pk_debug ("polling check");
+
message = _("Additional firmware is required to make hardware in this computer function correctly.");
notification = notify_notification_new (_("Additional firmware required"), message, "help-browser", NULL);
notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
diff --git a/src/gpk-install-catalog.c b/src/gpk-install-catalog.c
index 2771cf9..46b68b3 100644
--- a/src/gpk-install-catalog.c
+++ b/src/gpk-install-catalog.c
@@ -86,7 +86,7 @@ main (int argc, char *argv[])
/* find the file list */
files = gpk_convert_argv_to_strv (argv);
gclient = gpk_client_new ();
-
+ gpk_client_set_interaction (gclient, GPK_CLIENT_INTERACT_ALWAYS);
/* install all the catalogs */
ret = gpk_client_install_catalogs (gclient, files, NULL);
diff --git a/src/gpk-install-local-file.c b/src/gpk-install-local-file.c
index f006426..0ea8c26 100644
--- a/src/gpk-install-local-file.c
+++ b/src/gpk-install-local-file.c
@@ -85,6 +85,7 @@ main (int argc, char *argv[])
error = NULL;
gclient = gpk_client_new ();
+ gpk_client_set_interaction (gclient, GPK_CLIENT_INTERACT_ALWAYS);
files = gpk_convert_argv_to_strv (argv);
ret = gpk_client_install_local_files (gclient, files, NULL);
g_strfreev (files);
diff --git a/src/gpk-install-mime-type.c b/src/gpk-install-mime-type.c
index 16a6b30..7f8184a 100644
--- a/src/gpk-install-mime-type.c
+++ b/src/gpk-install-mime-type.c
@@ -89,6 +89,7 @@ main (int argc, char *argv[])
error = NULL;
gclient = gpk_client_new ();
+ gpk_client_set_interaction (gclient, GPK_CLIENT_INTERACT_ALWAYS);
ret = gpk_client_install_mime_type (gclient, argv[1], NULL);
g_object_unref (gclient);
diff --git a/src/gpk-install-package-name.c b/src/gpk-install-package-name.c
index 8e17c10..c9d4f9a 100644
--- a/src/gpk-install-package-name.c
+++ b/src/gpk-install-package-name.c
@@ -85,6 +85,7 @@ main (int argc, char *argv[])
error = NULL;
gclient = gpk_client_new ();
+ gpk_client_set_interaction (gclient, GPK_CLIENT_INTERACT_ALWAYS);
packages = gpk_convert_argv_to_strv (argv);
ret = gpk_client_install_package_names (gclient, packages, NULL);
g_strfreev (packages);
diff --git a/src/gpk-install-provide-file.c b/src/gpk-install-provide-file.c
index a03ea57..d1948af 100644
--- a/src/gpk-install-provide-file.c
+++ b/src/gpk-install-provide-file.c
@@ -89,6 +89,7 @@ main (int argc, char *argv[])
error = NULL;
gclient = gpk_client_new ();
+ gpk_client_set_interaction (gclient, GPK_CLIENT_INTERACT_ALWAYS);
ret = gpk_client_install_provide_file (gclient, argv[1], NULL);
g_object_unref (gclient);
diff --git a/src/gpk-smart-icon.c b/src/gpk-smart-icon.c
index 59d67f5..15052e8 100644
--- a/src/gpk-smart-icon.c
+++ b/src/gpk-smart-icon.c
@@ -112,6 +112,9 @@ gpk_smart_icon_pulse_timeout_cb (gpointer data)
g_return_val_if_fail (GPK_IS_SMART_ICON (sicon), FALSE);
+ /* debug so we can catch polling */
+ pk_debug ("polling check");
+
/* have we hidden the icon already? */
if (sicon->priv->current == NULL || sicon->priv->new == NULL) {
pk_debug ("not pulsing as icon cleared");
@@ -174,6 +177,9 @@ gpk_smart_icon_set_icon_name_cb (gpointer data)
{
GpkSmartIcon *sicon = (GpkSmartIcon *) data;
+ /* debug so we can catch polling */
+ pk_debug ("polling check");
+
/* no point setting the same */
if (sicon->priv->new != NULL &&
sicon->priv->current != NULL &&
diff --git a/src/gpk-watch.c b/src/gpk-watch.c
index 317e16d..c091802 100644
--- a/src/gpk-watch.c
+++ b/src/gpk-watch.c
@@ -284,7 +284,7 @@ gpk_watch_finished_cb (PkTaskList *tlist, PkClient *client, PkExitEnum exit, gui
PkRoleEnum role;
PkRestartEnum restart;
GError *error = NULL;
- gchar *package_id;
+ gchar *package_id = NULL;
gchar *message = NULL;
gchar *package;
const gchar *restart_message;
@@ -297,7 +297,7 @@ gpk_watch_finished_cb (PkTaskList *tlist, PkClient *client, PkExitEnum exit, gui
ret = pk_client_get_role (client, &role, &package_id, NULL);
if (!ret) {
pk_warning ("cannot get role");
- return;
+ goto out;
}
pk_debug ("role=%s, package=%s", pk_role_enum_to_text (role), package_id);
@@ -318,20 +318,20 @@ gpk_watch_finished_cb (PkTaskList *tlist, PkClient *client, PkExitEnum exit, gui
/* is it worth showing a UI? */
if (runtime < 3000) {
pk_debug ("no notification, too quick");
- return;
+ goto out;
}
/* is it worth showing a UI? */
if (exit != PK_EXIT_ENUM_SUCCESS) {
pk_debug ("not notifying, as didn't complete okay");
- return;
+ goto out;
}
/* are we accepting notifications */
value = gconf_client_get_bool (watch->priv->gconf_client, GPK_CONF_NOTIFY_COMPLETED, NULL);
if (!value) {
pk_debug ("not showing notification as prevented in gconf");
- return;
+ goto out;
}
/* is caller able to handle the messages itself? */
@@ -339,11 +339,11 @@ gpk_watch_finished_cb (PkTaskList *tlist, PkClient *client, PkExitEnum exit, gui
if (!ret) {
pk_warning ("could not get caller active status: %s", error->message);
g_error_free (error);
- return;
+ goto out;
}
if (value) {
pk_debug ("not showing notification as caller is still present");
- return;
+ goto out;
}
if (role == PK_ROLE_ENUM_REMOVE_PACKAGES) {
@@ -360,7 +360,7 @@ gpk_watch_finished_cb (PkTaskList *tlist, PkClient *client, PkExitEnum exit, gui
/* nothing of interest */
if (message == NULL) {
- return;
+ goto out;
}
/* do the bubble */
@@ -375,6 +375,7 @@ gpk_watch_finished_cb (PkTaskList *tlist, PkClient *client, PkExitEnum exit, gui
g_error_free (error);
}
+out:
g_free (message);
g_free (package_id);
}
@@ -1003,6 +1004,9 @@ gpk_watch_set_proxies_ratelimit (GpkWatch *watch)
g_return_val_if_fail (GPK_IS_WATCH (watch), FALSE);
+ /* debug so we can catch polling */
+ pk_debug ("polling check");
+
proxy_http = gpk_watch_get_proxy_http (watch);
proxy_ftp = gpk_watch_get_proxy_ftp (watch);
++++++ gnome-packagekit-fate303359.patch ++++++
--- /var/tmp/diff_new_pack.x12383/_old 2008-07-31 02:08:57.000000000 +0200
+++ /var/tmp/diff_new_pack.x12383/_new 2008-07-31 02:08:57.000000000 +0200
@@ -1,16 +1,14 @@
-diff --git a/src/gpk-update-icon.c b/src/gpk-update-icon.c
-index 6dd369a..7cd4085 100644
---- a/src/gpk-update-icon.c
-+++ b/src/gpk-update-icon.c
-@@ -30,6 +30,7 @@
- #include