rpms/gnome-packagekit/F-9 gnome-packagekit-gpg-bodge.patch, 1.2, 1.3 gnome-packagekit.spec, 1.33, 1.34 sources, 1.18, 1.19

[Richard Hughes (rhughes)]

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-packagekit/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5103

Modified Files:
	gnome-packagekit-gpg-bodge.patch gnome-packagekit.spec sources 
Log Message:
* Wed Apr 30 2008 Richard Hughes  <rhughes at redhat.com> - 0.1.12-11.20080430
- Actually build the correct tarball so the patches apply.


gnome-packagekit-gpg-bodge.patch:

Index: gnome-packagekit-gpg-bodge.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-9/gnome-packagekit-gpg-bodge.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-packagekit-gpg-bodge.patch	30 Apr 2008 17:01:48 -0000	1.2
+++ gnome-packagekit-gpg-bodge.patch	30 Apr 2008 18:34:47 -0000	1.3
@@ -234,7 +234,7 @@
  	glade_xml = glade_xml_new (PK_DATA "/gpk-install-file.glade", NULL, NULL);
  	main_window = glade_xml_get_widget (glade_xml, "window_updates");
 diff --git a/src/gpk-update-viewer.c b/src/gpk-update-viewer.c
-index e7d32f2..3ffec9a 100644
+index e7d32f2..23c4808 100644
 --- a/src/gpk-update-viewer.c
 +++ b/src/gpk-update-viewer.c
 @@ -69,6 +69,10 @@ static int frame_counter = 0;
@@ -248,6 +248,32 @@
  enum {
  	PREVIEW_COLUMN_ICON,
  	PREVIEW_COLUMN_TEXT,
+@@ -1272,12 +1276,6 @@ pk_updates_finished_cb (PkClient *client, PkExitEnum exit, guint runtime, gpoint
+ 		pk_update_update_last_updated_time (client);
+ 	}
+ 
+-	/* we don't need to do anything here */
+-	if (role == PK_ROLE_ENUM_REFRESH_CACHE ||
+-	    role == PK_ROLE_ENUM_GET_UPDATE_DETAIL) {
+-		return;
+-	}
+-
+ 	/* stop the throbber */
+ 	pk_updates_preview_animation_stop ();
+ 
+@@ -1322,6 +1320,12 @@ pk_updates_finished_cb (PkClient *client, PkExitEnum exit, guint runtime, gpoint
+ 		}
+ 	}
+ 
++	/* HACK: force a new update -- fixed much better in master */
++	if (role == PK_ROLE_ENUM_REFRESH_CACHE) {
++		pk_button_overview_cb (NULL, NULL);
++		return;
++	}
++
+ 	populate_preview ();
+ }
+ 
 @@ -1498,6 +1502,29 @@ pk_updates_task_list_changed_cb (PkTaskList *tlist, gpointer data)
  	}
  }


Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-9/gnome-packagekit.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gnome-packagekit.spec	30 Apr 2008 17:01:48 -0000	1.33
+++ gnome-packagekit.spec	30 Apr 2008 18:34:47 -0000	1.34
@@ -5,7 +5,7 @@
 Summary:   GNOME PackageKit Client
 Name:      gnome-packagekit
 Version:   0.1.12
-Release:   10.%{?alphatag}%{?dist}
+Release:   11.%{?alphatag}%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://www.packagekit.org
@@ -137,6 +137,9 @@
 %{_datadir}/applications/gpk-*.desktop
 
 %changelog
+* Wed Apr 30 2008 Richard Hughes  <rhughes at redhat.com> - 0.1.12-11.20080430
+- Actually build the correct tarball so the patches apply.
+
 * Wed Apr 30 2008 Richard Hughes  <rhughes at redhat.com> - 0.1.12-10.20080430
 - Pull in the new snapshot from the stable GNOME_PACKAGEKIT_0_1_X branch.
 - Fixes rh#442223, which is a release blocker.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-9/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	30 Apr 2008 17:01:48 -0000	1.18
+++ sources	30 Apr 2008 18:34:47 -0000	1.19
@@ -1 +1 @@
-296d896ecbba574123cbf837f5623d31  gnome-packagekit-0.1.12-20080430.tar.gz
+6bc178bdcf3825c0eaf780f288b72963  gnome-packagekit-0.1.12-20080430.tar.gz