[meego-commits] 10556: Changes to devel:packagemanagement/gnome-packagekit

[Zhang Qiang]

Hi,
I have made the following changes to gnome-packagekit in project devel:packagemanagement. Please review and accept ASAP.

Thank You,
Zhang Qiang

[This message was auto-generated]

---

Request #10556:

  submit:   home:xiaoqiang:branches:devel:packagemanagement/gnome-packagekit(r3)(cleanup) -> devel:packagemanagement/gnome-packagekit


Message:
    a

State:   new          2010-12-02T18:57:31 xiaoqiang
Comment: None



changes files:
--------------
--- gnome-packagekit.changes
+++ gnome-packagekit.changes
@@ -0,0 +1,5 @@
+* Fri Dec  3 2010 Zhang Qiang <qiang.z.zhang at intel.com> - 2.30.3
+- Add gpk-application-move-search-check-to-perform_search.patch
+  to move the search check in gpk_application_perform_search()
+  to cover more cases. Fix BMC#9900
+

new:
----
  gpk-application-move-search-check-to-perform_search.patch

spec files:
-----------
--- gnome-packagekit.spec
+++ gnome-packagekit.spec
@@ -44,7 +44,7 @@
 Patch17:     gpk-application-make-apply-button-insensitive-while-applying.patch
 Patch18:     gpk-application-show-network-state.patch
 Patch19:     gpk-application-ignore-search-if-already-wip.patch
-
+Patch20:     gpk-application-move-search-check-to-perform_search.patch
 Requires:   glib2 >= %{glib2_version}
 Requires:   gtk2 >= %{gtk2_version}
 Requires:   gnome-icon-theme
@@ -153,11 +153,22 @@
 %patch18 -p1
 # gpk-application-ignore-search-if-already-wip.patch
 %patch19 -p1
+# gpk-application-move-search-check-to-perform_search.patch
+%patch20 -p1
 # >> setup
 # << setup
 
 %build
 # >> build pre
+MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-O2//' -e 's/-Wall//' -e 's/-Os//')
+export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
+	
+MOZ_OPT_FLAGS=$(echo $CFLAGS| %{__sed} -e 's/-O2//' -e 's/-Wall//' -e 's/-Os//')
+export CFLAGS=$MOZ_OPT_FLAGS
+
+MOZ_OPT_FLAGS=$(echo $CXXFLAGS| %{__sed} -e 's/-O2//' -e 's/-Wall//' -e 's/-Os//')
+export CXXFLAGS=$MOZ_OPT_FLAGS
+
 # << build pre
 
 %reconfigure --disable-static \

other changes:
--------------

++++++ gnome-packagekit.yaml
--- gnome-packagekit.yaml
+++ gnome-packagekit.yaml
@@ -29,6 +29,7 @@
     - gpk-application-make-apply-button-insensitive-while-applying.patch
     - gpk-application-show-network-state.patch
     - gpk-application-ignore-search-if-already-wip.patch
+    - gpk-application-move-search-check-to-perform_search.patch
 Description: |
     gnome-packagekit provides session applications for the PackageKit API.
     There are several utilities designed for installing, updating and

++++++ gpk-application-move-search-check-to-perform_search.patch (new)
--- gpk-application-move-search-check-to-perform_search.patch
+++ gpk-application-move-search-check-to-perform_search.patch
+diff -uNr gnome-packagekit-2.30.3/src/gpk-application.c gnome-packagekit-2.30.3.new/src/gpk-application.c
+--- gnome-packagekit-2.30.3/src/gpk-application.c	2010-12-03 10:33:25.499512004 +0800
++++ gnome-packagekit-2.30.3.new/src/gpk-application.c	2010-12-03 10:49:18.797512044 +0800
+@@ -1688,6 +1688,8 @@
+ 
+ 	g_return_if_fail (GPK_IS_APPLICATION (application));
+ 	g_return_if_fail (application->priv->group != NULL);
++	
++	application->priv->search_in_progress = TRUE;
+ 
+ 	if (application->priv->search_mode == PK_MODE_GROUP) {
+ 		groups = g_strsplit (application->priv->group, " ", -1);
+@@ -1761,6 +1763,10 @@
+ {
+ 	g_return_if_fail (GPK_IS_APPLICATION (application));
+ 
++	/*if we are in the middle of a search, just return*/
++	if (application->priv->search_in_progress == TRUE)
++		return;
++
+ 	gpk_application_clear_details (application);
+ 	gpk_application_clear_packages (application);
+ 
+@@ -1784,10 +1790,6 @@
+ {
+ 	g_return_if_fail (GPK_IS_APPLICATION (application));
+ 
+-	/*if we are in the middle of a search, just return*/
+-	if (application->priv->search_in_progress == TRUE)
+-		return;
+-
+ 	application->priv->search_mode = PK_MODE_NAME_DETAILS_FILE;
+ 	gpk_application_perform_search (application);
+ }