Update spec and disable Tizen storage manager for now

Change-Id: I9d03e0f1268a69037a84978cf280dfc84a2a00d4

diff --git a/packaging/gsignond.spec b/packaging/gsignond.spec
index 7b7983c..5c8fc7f 100644 (file)
--- a/packaging/gsignond.spec
+++ b/packaging/gsignond.spec
@@ -12,7 +12,7 @@ Group: Security/Accounts
 License: LGPL-2.1+
 Source: %{name}-%{version}.tar.gz
 URL: https://01.org/gsso
-Source1001:     %{name}.manifest
+Source1001: %{name}.manifest
 Provides: gsignon
 %if %{dbus_type} != "p2p"
 Requires: dbus-1
@@ -26,6 +26,8 @@ BuildRequires: pkgconfig(gio-2.0)
 BuildRequires: pkgconfig(gio-unix-2.0)
 BuildRequires: pkgconfig(gmodule-2.0)
 BuildRequires: pkgconfig(sqlite3)
+BuildRequires: pkgconfig(libecryptfs)
+BuildRequires: pkgconfig(libsmack)
 
 
 %description
@@ -34,7 +36,7 @@ BuildRequires: pkgconfig(sqlite3)
 
 %package devel
 Summary:    Development files for %{name}
-Group:      Development/Libraries
+Group:      SDK/Libraries
 Requires:   %{name} = %{version}-%{release}
 
 %description devel
@@ -43,7 +45,7 @@ Requires:   %{name} = %{version}-%{release}
 
 %package doc
 Summary:    Documentation files for %{name}
-Group:      Development/Libraries
+Group:      SDK/Documentation
 Requires:   %{name} = %{version}-%{release}
 
 %description doc
@@ -52,6 +54,7 @@ Requires:   %{name} = %{version}-%{release}
 
 %prep
 %setup -q -n %{name}-%{version}
+cp %{SOURCE1001} .
 
 
 %build
@@ -67,7 +70,6 @@ make %{?_smp_mflags}
 %install
 rm -rf %{buildroot}
 %make_install
-cp -a %{SOURCE1001} %{buildroot}%{_datadir}/%{name}.manifest
 
 
 %post
@@ -81,7 +83,7 @@ getent group gsignond > /dev/null || /usr/sbin/groupadd -r gsignond
 
 %files
 %defattr(-,root,root,-)
-%manifest %{_datadir}/%{name}.manifest
+%manifest %{name}.manifest
 %doc AUTHORS COPYING.LIB INSTALL NEWS README
 %{_bindir}/%{name}
 %{_libdir}/lib%{name}-*.so.*

diff --git a/src/extensions/tizen/tizen-extension.c b/src/extensions/tizen/tizen-extension.c
index 059e461..9717097 100644 (file)
--- a/src/extensions/tizen/tizen-extension.c
+++ b/src/extensions/tizen/tizen-extension.c
@@ -72,6 +72,7 @@ _get_extension_version (GSignondExtension *self)
     return 0x01000000;
 }
 
+#if 0
 static GSignondStorageManager *
 _get_storage_manager (GSignondExtension *self, GSignondConfig *config)
 {
@@ -102,6 +103,7 @@ _get_secret_storage (GSignondExtension *self, GSignondConfig *config)
 
     return priv->secret_storage;
 }
+#endif
 
 static GSignondAccessControlManager *
 _get_access_control_manager (GSignondExtension *self, GSignondConfig *config)
@@ -129,8 +131,11 @@ extension_tizen_class_init (ExtensionTizenClass *klass)
     G_OBJECT_CLASS (klass)->dispose = _dispose;
     parent_class->get_extension_name = _get_extension_name;
     parent_class->get_extension_version = _get_extension_version;
+    // disable storage manager for now until TEE API has been settled
+#   if 0
     parent_class->get_storage_manager = _get_storage_manager;
     parent_class->get_secret_storage = _get_secret_storage;
+#   endif
     parent_class->get_access_control_manager = _get_access_control_manager;
 }