Merge "Migrating wrt-installer from libprivilege-control to security-manager usage...

diff --cc packaging/wrt-installer.spec
index 196ca0b,4bff826..3f0bba5
--- 1/packaging/wrt-installer.spec
--- 2/packaging/wrt-installer.spec
+++ b/packaging/wrt-installer.spec
@@@ -102,21 -90,10 +99,21 @@@ LDFLAGS="$LDFLAGS
  %else
           -DDECRYPT_SUPPORT=Off \
  %endif
 +%if %{with wayland}
 +         -DWAYLAND_SUPPORT=On \
 +%else
 +         -DWAYLAND_SUPPORT=Off \
 +%endif
 +%if %{with x}
 +         -DX11_SUPPORT=On \
 +%else
 +         -DX11_SUPPORT=Off \
 +%endif
          -DSYSCONFDIR=%{_sysconfdir} \
-         -DSMACK=Off \
+         -DSMACK=ON \
          -DDPL_LOG=ON \
          -DCMAKE_BUILD_TYPE=%{?build_type:%build_type} \
 +        -DTZ_SYS_APP_PREINSTALL=%TZ_SYS_APP_PREINSTALL \
          %{?WITH_TESTS:-DWITH_TESTS=%WITH_TESTS}
  make %{?jobs:-j%jobs}
  

diff --cc src/CMakeLists.txt
index d9805eb,9ae801c..006df61
--- 1/src/CMakeLists.txt
--- 2/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -175,31 -174,9 +175,31 @@@ PKG_CHECK_MODULES(SYS_INSTALLER_STATIC_
      shortcut
      capi-appfw-app-manager
      app2sd
-     libprivilege-control
+     security-manager
      REQUIRED
  )
 +ELSE(WAYLAND_SUPPORT)
 +PKG_CHECK_MODULES(SYS_INSTALLER_STATIC_DEP
 +    appsvc
 +    libxml-2.0
 +    openssl
 +    cert-svc-vcore
 +    security-install
 +    ecore-wayland
 +    xmlsec1
 +    libidn
 +    libiri
 +    libpcrecpp
 +    ail
 +    elementary
 +    tapi
 +    shortcut
 +    capi-appfw-app-manager
 +    app2sd
 +    libprivilege-control
 +    REQUIRED
 +)
 +ENDIF(X11_SUPPORT)
  
  INCLUDE_DIRECTORIES( SYSTEM ${SYS_INSTALLER_STATIC_DEP_INCLUDE_DIRS})