[meego-commits] 23610: Changes to MeeGo:1.2:oss/ohm

[Peter Zhu]

Hi,
I have made the following changes to ohm in project MeeGo:1.2:oss. Please review and accept ASAP.

Thank You,
Peter Zhu

[This message was auto-generated]

---

Request #23610:

  submit:   MeeGo:1.2:oss:Testing/ohm(r2) -> MeeGo:1.2:oss/ohm


Message:
    Move to MeeGo:1.2:oss

State:   new          2011-08-10T07:23:31 peter
Comment: None



changes files:
--------------
--- ohm.changes
+++ ohm.changes
@@ -0,0 +1,3 @@
+* Thu Aug 04 2011 vivian zhang <vivian.zhang at intel.com> - 1.1.14
+- Only list the necessary modules in modules.ini fixed BMC #22490
+

new:
----
  update-moduleini-to-make-it-works-on-all-platform.patch

spec files:
-----------
--- ohm.spec
+++ ohm.spec
@@ -17,6 +17,7 @@
 Source100:  ohm.yaml
 Patch0:     module_configure.patch
 Patch1:     load_platform_specific_parameter.patch
+Patch2:     update-moduleini-to-make-it-works-on-all-platform.patch
 Requires:   ohm-config
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(dbus-1)
@@ -63,6 +64,7 @@
 %setup -q -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # >> setup
 # << setup

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

++++++ update-moduleini-to-make-it-works-on-all-platform.patch (new)
--- update-moduleini-to-make-it-works-on-all-platform.patch
+++ update-moduleini-to-make-it-works-on-all-platform.patch
+diff -Nur ohm-1.1.14/etc/modules.ini ohm-1.1.14-new/etc/modules.ini
+--- ohm-1.1.14/etc/modules.ini	2010-10-18 04:13:55.000000000 +0800
++++ ohm-1.1.14-new/etc/modules.ini	2011-08-04 10:33:38.337876542 +0800
+@@ -6,4 +6,4 @@
+ ModulesSuggested=
+ #ModulesRequired=policy;cscall;audioroute;accessories;profiles;headset
+ #ModulesRequired=console;prolog;signaling;dres;playback;hal;profile
+-ModulesRequired=*
++ModulesRequired=rule_engine;signaling;dres;resource;delay;auth