[meego-commits] 14846: Changes to MeeGo:1.1:Core:Update:Testing/PackageKit

[Zhang Qiang]

Hi,
I have made the following changes to PackageKit in project MeeGo:1.1:Core:Update:Testing. Please review and accept ASAP.

Thank You,
Zhang Qiang

[This message was auto-generated]

---

Request #14846:

  submit:   home:xiaoqiang:branches:MeeGo:1.1:Core:Update:Testing/PackageKit(r5)(cleanup) -> MeeGo:1.1:Core:Update:Testing/PackageKit


Message:
    Add 0019-remove-online-check-in-refresh.patch to remove online check while refresh cache, Fix BMC#12368; Add 0020-fix-connman-Dbus-Name.patch to fix BMC#13666

State:   new          2011-03-15T19:43:54 xiaoqiang
Comment: None



changes files:
--------------
--- PackageKit.changes
+++ PackageKit.changes
@@ -0,0 +1,5 @@
+* Fri Feb 18 2011 Zhang Qiang<qiang.z.zhang at intel.com> - 0.6.7
+- Add 0019-remove-online-check-in-refresh.patch to remove online
+  check while refresh cache, Fix BMC#12368.
+- Add 0020-fix-connman-Dbus-Name.patch to fix BMC#13666
+

new:
----
  0019-remove-online-check-in-refresh.patch
  0020-fix-connman-Dbus-Name.patch

spec files:
-----------
--- PackageKit.spec
+++ PackageKit.spec
@@ -32,6 +32,8 @@
 Patch26:   pk-zypp-set-proxy-env.patch
 Patch27:   0001-Sent-correct-network-state-for-connman-end.patch
 Patch28:   meego-connman-conf.patch
+Patch29:   0019-remove-online-check-in-refresh.patch
+Patch30:   0020-fix-connman-Dbus-Name.patch
 
 Requires: PackageKit-gtk-module = %{version}-%{release}
 Requires: PackageKit-zypp = %{version}-%{release}
@@ -260,9 +262,18 @@
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
+%patch29 -p1
+%patch30 -p1
 
 %build
+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
 %configure \
 	--disable-static \
 	--enable-zypp \

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

++++++ 0019-remove-online-check-in-refresh.patch (new)
--- 0019-remove-online-check-in-refresh.patch
+++ 0019-remove-online-check-in-refresh.patch
+diff -uNr PackageKit-0.6.7/backends/zypp/zypp-utils.cpp PackageKit-0.6.7.new/backends/zypp/zypp-utils.cpp
+--- PackageKit-0.6.7/backends/zypp/zypp-utils.cpp	2011-02-18 10:05:03.381565022 +0800
++++ PackageKit-0.6.7.new/backends/zypp/zypp-utils.cpp	2011-02-18 10:06:09.393502666 +0800
+@@ -1014,11 +1014,6 @@
+         
+ 	zypp::sat::Pool pool = zypp::sat::Pool::instance ();
+         
+-	if (!pk_backend_is_online (backend)) {
+-		pk_backend_error_code (backend, PK_ERROR_ENUM_NO_NETWORK, "Cannot refresh cache whilst offline");
+-		return FALSE;
+-	}
+-
+ 	pk_backend_set_status (backend, PK_STATUS_ENUM_REFRESH_CACHE);
+ 	pk_backend_set_percentage (backend, 0);
+ 

++++++ 0020-fix-connman-Dbus-Name.patch (new)
--- 0020-fix-connman-Dbus-Name.patch
+++ 0020-fix-connman-Dbus-Name.patch
+diff -uNr PackageKit-0.6.11/src/pk-network-stack-connman.c PackageKit-0.6.11.new/src/pk-network-stack-connman.c
+--- PackageKit-0.6.11/src/pk-network-stack-connman.c	2010-10-18 18:45:46.000000000 +0800
++++ PackageKit-0.6.11.new/src/pk-network-stack-connman.c	2011-02-18 12:28:51.547565129 +0800
+@@ -44,7 +44,7 @@
+ G_DEFINE_TYPE (PkNetworkStackConnman, pk_network_stack_connman, PK_TYPE_NETWORK_STACK)
+ #define PK_NETWORK_STACK_CONNMAN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PK_TYPE_NETWORK_STACK_CONNMAN, PkNetworkStackConnmanPrivate))
+ 
+-#define CONNMAN_DBUS_NAME			"org.moblin.connman"
++#define CONNMAN_DBUS_NAME			"net.connman"
+ #define CONNMAN_MANAGER_DBUS_INTERFACE		CONNMAN_DBUS_NAME ".Manager"
+ #define CONNMAN_SERVICE_DBUS_INTERFACE		CONNMAN_DBUS_NAME ".Service"
+ #define CONNMAN_MANAGER_DBUS_PATH		"/"