rpms/gnome-packagekit/F-10 gnome-packagekit-0.3.11-fix-desktop-linguas.patch, NONE, 1.1 gnome-packagekit-0.3.11-fix-small-form-factor-mode.patch, NONE, 1.1 gnome-packagekit-0.3.11-show-force-install.patch, NONE, 1.1 gnome-packagekit.spec, 1.67, 1.68

[Richard Hughes]

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-packagekit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18420

Modified Files:
	gnome-packagekit.spec 
Added Files:
	gnome-packagekit-0.3.11-fix-desktop-linguas.patch 
	gnome-packagekit-0.3.11-fix-small-form-factor-mode.patch 
	gnome-packagekit-0.3.11-show-force-install.patch 
Log Message:
* Mon Dec 01 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.11-3
- Enable translations for PkDesktop as it mas missed from LINGUAS
- Don't crash gpk-application on small form factor devices
- Use the correct widget name when enabling the "force install" button


gnome-packagekit-0.3.11-fix-desktop-linguas.patch:

--- NEW FILE gnome-packagekit-0.3.11-fix-desktop-linguas.patch ---
commit bd21710fe4b3fb4800d8fabcc3a2b1aff85e9361
Author: Richard Hughes <richard at hughsie.com>
Date:   Fri Nov 28 18:02:36 2008 +0000

    trivial: add gpk-desktop to the list of translated files to fix make check

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 849656a..099a6b2 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -54,5 +54,6 @@ src/gpk-smart-icon.c
 src/gpk-update-icon.c
 src/gpk-update-viewer.c
 src/gpk-watch.c
+src/gpk-desktop.c
 python/packagekit/gtkwidgets.py
 

gnome-packagekit-0.3.11-fix-small-form-factor-mode.patch:

--- NEW FILE gnome-packagekit-0.3.11-fix-small-form-factor-mode.patch ---
commit 86f2618a71b4e2c4528448ce06179e0923460fb9
Author: Richard Hughes <richard at hughsie.com>
Date:   Fri Nov 28 18:00:11 2008 +0000

    bugfix: don't abort with an error if we are using small form factor mode

diff --git a/src/gpk-common.c b/src/gpk-common.c
index 7047f03..ed31051 100644
--- a/src/gpk-common.c
+++ b/src/gpk-common.c
@@ -56,7 +56,7 @@ gpk_window_set_size_request (GtkWindow *window, guint width, guint height)
 	screen_w = gdk_screen_get_width (screen);
 	screen_h = gdk_screen_get_height (screen);
 	if (screen_w < width || screen_h < height) {
-		egg_error ("using small form factor mode as %ix%i and requested %ix%i",
+		egg_debug ("using small form factor mode as %ix%i and requested %ix%i",
 			   screen_w, screen_h, width, height);
 		gtk_window_maximize (window);
 		return FALSE;

gnome-packagekit-0.3.11-show-force-install.patch:

--- NEW FILE gnome-packagekit-0.3.11-show-force-install.patch ---
commit 75bd966787688b0cdf5b10b2d0e0b89e4b834e4c
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Nov 27 16:42:42 2008 +0000

    bugfix: show the 'Force Install' button on the unsigned dialog UI

diff --git a/src/gpk-client-untrusted.c b/src/gpk-client-untrusted.c
index 44b1519..f18ea6c 100644
--- a/src/gpk-client-untrusted.c
+++ b/src/gpk-client-untrusted.c
@@ -70,9 +70,6 @@ gpk_client_untrusted_show (PkErrorCodeEnum code)
 	/* connect up actions */
 	widget = glade_xml_get_widget (glade_xml, "dialog_error");
 	g_signal_connect_swapped (widget, "delete_event", G_CALLBACK (gtk_main_quit), NULL);
-
-	/* set icon name */
-	widget = glade_xml_get_widget (glade_xml, "dialog_error");
 	gtk_window_set_icon_name (GTK_WINDOW (widget), GPK_ICON_SOFTWARE_INSTALLER);
 
 	/* close button */
@@ -122,7 +119,11 @@ gpk_client_untrusted_show (PkErrorCodeEnum code)
 	g_signal_connect (update_system_action, "activate",
 			  G_CALLBACK (gpk_client_untrusted_button_cb), NULL);
 	button = polkit_gnome_action_create_button (update_system_action);
-	widget = glade_xml_get_widget (glade_xml, "hbuttonbox2");
+	gtk_widget_show (button);
+
+	/* add to box */
+	widget = glade_xml_get_widget (glade_xml, "dialog_error");
+	widget = gtk_dialog_get_action_area (GTK_DIALOG(widget));
 	gtk_box_pack_start (GTK_BOX (widget), button, FALSE, FALSE, 0);
 
 	/* show window */


Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-10/gnome-packagekit.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- gnome-packagekit.spec	28 Nov 2008 11:23:00 -0000	1.67
+++ gnome-packagekit.spec	1 Dec 2008 12:51:52 -0000	1.68
@@ -6,7 +6,7 @@
 Summary:   GNOME PackageKit Client
 Name:      gnome-packagekit
 Version:   0.3.11
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://www.packagekit.org
@@ -14,8 +14,19 @@
 Source1:   system-install-packages
 Source2:   system-install-packages.1.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# Fedora specific, not to go upstream
 Patch0:    gnome-packagekit-enable-kde.patch
 
+# from git, bd21710fe4b3fb4800d8fabcc3a2b1aff85e9361
+Patch1:    gnome-packagekit-0.3.11-fix-desktop-linguas.patch
+
+# from git, 86f2618a71b4e2c4528448ce06179e0923460fb9
+Patch2:    gnome-packagekit-0.3.11-fix-small-form-factor-mode.patch
+
+# from git, 75bd966787688b0cdf5b10b2d0e0b89e4b834e4c
+Patch3:    gnome-packagekit-0.3.11-show-force-install.patch
+
 Requires:  gtk2 >= 2.12.0
 Requires:  gnome-icon-theme
 Requires:  libnotify >= 0.4.3
@@ -72,6 +83,9 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %configure --disable-scrollkeeper --disable-schemas-install
@@ -206,6 +220,11 @@
 %{_datadir}/applications/gpk-service-pack.desktop
 
 %changelog
+* Mon Dec 01 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.11-3
+- Enable translations for PkDesktop as it mas missed from LINGUAS
+- Don't crash gpk-application on small form factor devices
+- Use the correct widget name when enabling the "force install" button
+
 * Fri Nov 28 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.11-2
 - Rebuild because Bodhi hates me.