Sync with tizen_2.2

Conflicts:
	packaging/secure-storage.spec
	ss-server.manifest

diff --cc packaging/secure-storage.spec
index d416a0e,0b77adf..e8bd09a
mode 100644,100755..100755
--- 1/packaging/secure-storage.spec
--- 2/packaging/secure-storage.spec
+++ b/packaging/secure-storage.spec
@@@ -5,15 -5,12 +5,15 @@@ Release:    
  Group:      System/Security
  License:    Apache 2.0
  Source0:    secure-storage-%{version}.tar.gz
- Source1:    secure-storage.service
 +Source1001:   libss-client.manifest
 +Source1002:   libss-client-devel.manifest
 +Source1003:   ss-server.manifest
  BuildRequires:  pkgconfig(openssl)
  BuildRequires:  pkgconfig(dlog)
- #BuildRequires:  pkgconfig(libsystemd-daemon)
+ BuildRequires:  pkgconfig(libsystemd-daemon)
  BuildRequires:  pkgconfig(security-server)
  BuildRequires:  cmake
+ BuildRequires:  pkgconfig(dukgenerator)
  
  %description
  Secure storage package