Add proper capi-appfw-app-control dependency 53/41753/1
authorSungmin Kwak <sungmin.kwak@samsung.com>
Thu, 14 May 2015 04:44:45 +0000 (13:44 +0900)
committerLi Zhang <li2012.zhang@samsung.com>
Wed, 17 Jun 2015 09:37:22 +0000 (17:37 +0800)
Fix typo

Change-Id: I9fd6046161f882c776503d79c57fe8611fc7688d

configure.ac [changed mode: 0755->0644]
ism/demos/Makefile.am
ism/extras/efl_panel/Makefile.am
ism/extras/efl_panel/isf_panel_efl.cpp
packaging/isf.spec

old mode 100755 (executable)
new mode 100644 (file)
index 22a7e68..fa95884
@@ -311,6 +311,9 @@ PKG_CHECK_MODULES(FEEDBACK, [feedback],
 # Check package manager
 PKG_CHECK_MODULES(PACKAGE_MANAGER, [capi-appfw-package-manager])
 
+# Check App Control
+PKG_CHECK_MODULES(APP_CONTROL, [capi-appfw-app-control])
+
 # Check core package manager
 PKG_CHECK_MODULES(PKGMGR_INFO, [pkgmgr-info],
                   [ISF_HAS_PKGMGR_INFO=yes],
index c963006..c6d7ba3 100644 (file)
@@ -50,6 +50,7 @@ isf_demo_efl_CXXFLAGS = @EFL_CFLAGS@ \
                         @PRIVILEGE_CONTROL_CFLAGS@ \
                         @EFL_EXTENSION_CFLAGS@ \
                         @DLOG_CFLAGS@ \
+                        @APP_CONTROL_CFLAGS@ \
                         -fPIE
 
 isf_demo_efl_LDFLAGS  = @EFL_LIBS@ @LTLIBINTL@ -rpath $(libdir) \
@@ -60,6 +61,7 @@ isf_demo_efl_LDFLAGS  = @EFL_LIBS@ @LTLIBINTL@ -rpath $(libdir) \
                         @PRIVILEGE_CONTROL_LIBS@ \
                         @EFL_EXTENSION_LIBS@ \
                         @DLOG_LIBS@ \
+                        @APP_CONTROL_LIBS@ \
                         -pie
 
 isf_demo_efl_LDADD    = $(top_builddir)/ism/src/libscim@SCIM_EPOCH@.la
index 44f376c..a3fe3f2 100644 (file)
@@ -50,6 +50,7 @@ isf_panel_efl_CXXFLAGS = @EFL_CFLAGS@ \
                          @UIGADGET_CFLAGS@ \
                          @PACKAGE_MANAGER_CFLAGS@ \
                          @PKGMGR_INFO_CFLAGS@ \
+                         @APP_CONTROL_CFLAGS@ \
                          -fPIE
 
 isf_panel_efl_LDFLAGS  = @EFL_LIBS@ @LTLIBINTL@ -rpath $(libdir) \
@@ -68,6 +69,7 @@ isf_panel_efl_LDFLAGS  = @EFL_LIBS@ @LTLIBINTL@ -rpath $(libdir) \
                          @UIGADGET_LIBS@ \
                          @PACKAGE_MANAGER_LIBS@ \
                          @PKGMGR_INFO_LIBS@ \
+                         @APP_CONTROL_LIBS@ \
                          -pie
 
 isf_panel_efl_LDADD    = $(top_builddir)/ism/src/libscim@SCIM_EPOCH@.la
index 625983b..86010c4 100644 (file)
@@ -4826,7 +4826,7 @@ static void slot_set_enable_helper_ise_info (const String &appid, bool is_enable
  */
 static void slot_show_helper_ise_list (void)
 {
-    // Lauch org.tizen.inputmethod-setting-list
+    // Launch org.tizen.inputmethod-setting-list
     int ret;
     app_control_h app_control;
     const char *app_id = "org.tizen.inputmethod-setting-list"; // This is temporary. AppId can be got using pkgmgr-info later.
@@ -4868,7 +4868,7 @@ static void slot_show_helper_ise_list (void)
  */
 static void slot_show_helper_ise_selector (void)
 {
-    // Lauch org.tizen.inputmethod-setting-selector
+    // Launch org.tizen.inputmethod-setting-selector
     int ret;
     app_control_h app_control;
     const char *app_id = "org.tizen.inputmethod-setting-selector"; // This is temporary. AppId can be got using pkgmgr-info later.
index 77c479d..3ce9f73 100644 (file)
@@ -35,6 +35,7 @@ BuildRequires:  efl-extension-devel
 BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  pkgconfig(pkgmgr-info)
 BuildRequires:  pkgconfig(db-util)
+BuildRequires:  pkgconfig(capi-appfw-app-control)
 BuildRequires:  capi-appfw-package-manager-devel
 Requires(post): /sbin/ldconfig /usr/bin/vconftool
 Requires(postun): /sbin/ldconfig