[meego-commits] 14423: Changes to Trunk:Testing/meegotouchcp-connman

[aruravin]

Hi,
I have made the following changes to meegotouchcp-connman in project Trunk:Testing. Please review and accept ASAP.

Thank You,
aruravin

[This message was auto-generated]

---

Request #14423:

  submit:   home:aruravin:branches:Trunk:Testing/meegotouchcp-connman(r5)(update) -> Trunk:Testing/meegotouchcp-connman


Message:
    Added options to ensure build order.

State:   new          2011-03-01T19:59:35 aruravin
Comment: None



changes files:
--------------
--- meegotouchcp-connman.changes
+++ meegotouchcp-connman.changes
@@ -0,0 +1,4 @@
+* Wed Mar 02 2011 Arun Ravindran <ext-arun.1.ravindran at nokia.com> - 0.0.13
+- Added CONFIG+=ordered option to .pro file ensure building libconnman-qt 
+- before libwifiapplet
+

new:
----
  fix_ensure_build_order.patch

spec files:
-----------
--- meegotouchcp-connman.spec
+++ meegotouchcp-connman.spec
@@ -14,9 +14,10 @@
 URL:        http://www.meego.com
 Source0:    %{name}-%{version}.tar.bz2
 Source100:  meegotouchcp-connman.yaml
-Patch0:     0001-Fix-BMC-811-and-BMC-3397.patch
-Patch1:     fix-build-issues.patch
-Patch2:     fix_connman_interface_usage.patch
+Patch0:     fix_ensure_build_order.patch 
+Patch1:     0001-Fix-BMC-811-and-BMC-3397.patch
+Patch2:     fix-build-issues.patch
+Patch3:     fix_connman_interface_usage.patch
 Requires:   connman
 Requires:   meego-handset-cpwifi-branding
 BuildRequires:  pkgconfig(QtCore) >= 4.6.0
@@ -68,12 +69,14 @@
 %prep
 %setup -q -n %{name}-%{version}
 
-# 0001-Fix-BMC-811-and-BMC-3397.patch
+#fix_ensure_build_order.patch
 %patch0 -p1
-# fix-build-issues.patch
+# 0001-Fix-BMC-811-and-BMC-3397.patch
 %patch1 -p1
-#fix_connman_interface_usage.patch
+# fix-build-issues.patch
 %patch2 -p1
+#fix_connman_interface_usage.patch
+%patch3 -p1
 # >> setup
 # << setup
 

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

++++++ fix_ensure_build_order.patch (new)
--- fix_ensure_build_order.patch
+++ fix_ensure_build_order.patch
+diff -rup meegotouchcp-connman-0.0.13_orig/project.pro meegotouchcp-connman-0.0.13/project.pro
+--- meegotouchcp-connman-0.0.13_orig/project.pro	2011-03-02 10:39:21.082946740 +0200
++++ meegotouchcp-connman-0.0.13/project.pro	2011-03-02 10:40:07.401694894 +0200
+@@ -2,6 +2,7 @@
+ 
+ include (common.pri)
+ TEMPLATE = subdirs
++CONFIG += ordered
+ SUBDIRS += libconnman-qt libwifiapplet translations
+ 
+ #FIXME: should not hardcode

++++++ meegotouchcp-connman.yaml
--- meegotouchcp-connman.yaml
+++ meegotouchcp-connman.yaml
@@ -25,6 +25,7 @@
 Configure: none
 Builder: make
 Patches:
+  - fix_ensure_build_order.patch
   - 0001-Fix-BMC-811-and-BMC-3397.patch
   - fix-build-issues.patch
   - fix_connman_interface_usage.patch