Revise the spec file

Handling the reader/always shared folder
Clear all contents from the main function without script.

Change-Id: I2ca426ffb39782464b834defe16f928c7c2edcd5

diff --git a/include/conf.h b/include/conf.h
index 85acd34..ec05739 100644 (file)
--- a/include/conf.h
+++ b/include/conf.h
@@ -61,6 +61,8 @@ struct conf {
                char *root;
                char *script_port;
                char *slave_log;
+               char *reader;
+               char *always;
                char *db;
                char *module;
        } path;
@@ -118,6 +120,8 @@ extern int conf_loader(void);
 #define CONF_PATH              g_conf.path.conf
 #define ROOT_PATH              g_conf.path.root
 #define SLAVE_LOG_PATH         g_conf.path.slave_log
+#define READER_PATH            g_conf.path.reader
+#define ALWAYS_PATH            g_conf.path.always
 #define MODULE_PATH            g_conf.path.module
 
 #define REPLACE_TAG_APPID      g_conf.replace_tag

diff --git a/packaging/org.tizen.data-provider-slave.spec b/packaging/org.tizen.data-provider-slave.spec
index b5c9252..0d768b7 100644 (file)
--- a/packaging/org.tizen.data-provider-slave.spec
+++ b/packaging/org.tizen.data-provider-slave.spec
@@ -1,11 +1,11 @@
 Name: org.tizen.data-provider-slave
 Summary: Slave data provider
-Version: 0.8.17
+Version: 0.8.18
 Release: 1
 Group: main/app
 License: Flora License
 Source0: %{name}-%{version}.tar.gz
-BuildRequires: cmake, gettext-tools
+BuildRequires: cmake, gettext-tools, coreutils
 BuildRequires: pkgconfig(appcore-efl)
 BuildRequires: pkgconfig(ail)
 BuildRequires: pkgconfig(dlog)
@@ -42,13 +42,15 @@ CFLAGS="${CFLAGS} -Wall -Winline -Werror -fno-builtin-malloc" make %{?jobs:-j%jo
 %install
 rm -rf %{buildroot}
 %make_install
-mkdir -p %{buildroot}/usr/share/license
+mkdir -p %{buildroot}/%{_datarootdir}/license
 
 %post
 
 %files -n org.tizen.data-provider-slave
 %manifest org.tizen.data-provider-slave.manifest
 %defattr(-,root,root,-)
-/usr/apps/org.tizen.data-provider-slave/bin/data-provider-slave
-/usr/share/packages/org.tizen.data-provider-slave.xml
-/usr/share/license/*
+%{_prefix}/apps/org.tizen.data-provider-slave/bin/data-provider-slave
+%{_datarootdir}/packages/org.tizen.data-provider-slave.xml
+%{_datarootdir}/license/*
+
+# End of a file

diff --git a/src/conf.c b/src/conf.c
index 849d55a..b62784f 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -64,6 +64,8 @@ HAPI struct conf g_conf = {
        .path = {
                .image = "/opt/usr/share/live_magazine/",
                .slave_log = "/opt/usr/share/live_magazine/log",
+               .reader = "/opt/usr/share/live_magazine/reader",
+               .always = "/opt/usr/share/live_magazine/always",
                .root = "/opt/usr/live/",
                .script_port = "/opt/usr/live/script_port/",
                .db = "/opt/dbspace/.livebox.db",
@@ -251,6 +253,22 @@ static void db_path_handler(char *buffer)
        DbgPrint("DB Path: %s\n", g_conf.path.db);
 }
 
+static void reader_path_handler(char *buffer)
+{
+       g_conf.path.reader = strdup(buffer);
+       if (!g_conf.path.reader)
+               ErrPrint("Heap: %s\n", strerror(errno));
+       DbgPrint("Reader Path: %s\n", g_conf.path.reader);
+}
+
+static void always_path_handler(char *buffer)
+{
+       g_conf.path.always = strdup(buffer);
+       if (!g_conf.path.always)
+               ErrPrint("Heap: %s\n", strerror(errno));
+       DbgPrint("Always Path: %s\n", g_conf.path.always);
+}
+
 static void log_path_handler(char *buffer)
 {
        g_conf.path.slave_log = strdup(buffer);
@@ -386,6 +404,14 @@ HAPI int conf_loader(void)
                        .handler = log_path_handler,
                },
                {
+                       .name = "reader_path",
+                       .handler = reader_path_handler,
+               },
+               {
+                       .name = "always_path",
+                       .handler = always_path_handler,
+               },
+               {
                        .name = "share_path",
                        .handler = share_path_handler,
                },