include src/shared/dbus_macro.h in apps/*

Change-Id: I4c838338226cfada67e7913e6a8694b0e8b282d8
Signed-off-by: Hyotaek Shim <hyotaek.shim@samsung.com>
(cherry picked from commit b6ecf8f1696b7e75031a5c7cf65c1daad530fe37)

diff --git a/LICENSE b/LICENSE.Apache-2.0
similarity index 100%
rename from LICENSE
rename to LICENSE.Apache-2.0

diff --git a/apps/extended-sd/include/dbus-call.h b/apps/extended-sd/include/dbus-call.h
index 7250ae0..0a3a10c 100644 (file)
--- a/apps/extended-sd/include/dbus-call.h
+++ b/apps/extended-sd/include/dbus-call.h
@@ -22,18 +22,9 @@
 
 #include <glib.h>
 #include <gio/gio.h>
+#include "dbus_macro.h"
 #include "extended-sd-main.h"
 
-/* Block service: manage block device */
-#define STORAGED_BUS_NAME                    "org.tizen.system.storage"
-#define STORAGED_OBJECT_PATH                 "/Org/Tizen/System/Storage"
-#define STORAGED_INTERFACE_NAME              STORAGED_BUS_NAME
-#define STORAGED_PATH_BLOCK                  STORAGED_OBJECT_PATH"/Block"
-#define STORAGED_PATH_BLOCK_MANAGER          STORAGED_PATH_BLOCK"/Manager"
-#define STORAGED_INTERFACE_BLOCK_MANAGER     STORAGED_INTERFACE_NAME".BlockManager"
-
-#define POPUP_SDCARD_ID                     "_SDCARD_NUM_"
-
 struct dbus_int {
        int *list;
        int size;

diff --git a/apps/extended-sd/src/extended-sd-main.c b/apps/extended-sd/src/extended-sd-main.c
index 2e4c266..8bff947 100644 (file)
--- a/apps/extended-sd/src/extended-sd-main.c
+++ b/apps/extended-sd/src/extended-sd-main.c
@@ -1,8 +1,6 @@
 #include "extended-sd-main.h"
 #include "es-preference-util.h"
 #include "log-util.h"
-
-//#include "dbus-macro.h"
 #include "dbus-call.h"
 
 static void

diff --git a/packaging/storaged.spec b/packaging/storaged.spec
index 8467b30..046d11c 100644 (file)
--- a/packaging/storaged.spec
+++ b/packaging/storaged.spec
@@ -130,7 +130,7 @@ systemctl daemon-reload
 
 %files
 %manifest %{name}.manifest
-%license LICENSE
+%license LICENSE.Apache-2.0
 %config %{_sysconfdir}/dbus-1/system.d/storaged.conf
 %{_unitdir}/multi-user.target.wants/storaged.service
 %{_unitdir}/storaged.service
@@ -138,20 +138,20 @@ systemctl daemon-reload
 
 %files module_block
 %manifest %{name}.manifest
-%license LICENSE
+%license LICENSE.Apache-2.0
 %{_libdir}/storaged/module_block.so
 %{_bindir}/mmc-smack-label
 %config %{_sysconfdir}/storaged/block.conf
 
 %files module_storage
 %manifest %{name}.manifest
-%license LICENSE
+%license LICENSE.Apache-2.0
 %{_libdir}/storaged/module_storage.so
 %config %{_sysconfdir}/storaged/storage.conf
 
 %files org.tizen.extended-sd -f extended-sd.lang
 %manifest %{name}.manifest
-%license LICENSE
+%license LICENSE.Apache-2.0
 %defattr(-,root,root,-)
 %{TZ_SYS_RO_APP}/org.tizen.extended-sd/bin/*
 %{TZ_SYS_RO_APP}/org.tizen.extended-sd/res/*