Revert "Change indicator data directory"

This reverts commit a599766c61f457e37e4b8e84ca9b188d2fea1eec.

Change-Id: I494194e4d66d070f4a0f7608e1ecea93b1613ee3

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f7a7c9..03e6cc3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,9 +9,10 @@ SET(VENDOR "org.tizen")
 SET(PACKAGE ${PROJECT_NAME})
 SET(PKGNAME "${VENDOR}.${PACKAGE}")
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
+SET(PREFIXRW ${CMAKE_INSTALL_PREFIXRW})
 SET(BINDIR "${PREFIX}/bin")
 SET(RESDIR "${PREFIX}/res")
-SET(DATADIR "${PREFIX}/data")
+SET(DATADIR "${PREFIXRW}/data")
 SET(LOCALEDIR "${RESDIR}/locale")
 SET(ICONDIR "${RESDIR}/icons")
 SET(EDJDIR "${RESDIR}/edje")

diff --git a/packaging/org.tizen.indicator.spec b/packaging/org.tizen.indicator.spec
index 0093ca2..ac3f7be 100644 (file)
--- a/packaging/org.tizen.indicator.spec
+++ b/packaging/org.tizen.indicator.spec
@@ -1,6 +1,7 @@
 %define PKGNAME org.tizen.indicator
 %define PREFIX    /usr/apps/%{PKGNAME}
 %define RESDIR    %{PREFIX}/res
+%define PREFIXRW  /opt/usr/apps/%{PKGNAME}
 
 Name:       org.tizen.indicator
 Summary:    indicator window
@@ -79,7 +80,7 @@ CFLAGS+=" -fvisibility=hidden"; export CFLAGS
 CXXFLAGS+=" -fvisibility=hidden -fvisibility-inlines-hidden"; export CXXFLAGS
 FFLAGS+=" -fvisibility=hidden -fvisibility-inlines-hidden"; export FFLAGS
 
-cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX}
+cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} -DCMAKE_INSTALL_PREFIXRW=%{PREFIXRW} \
 
 
 make %{?jobs:-j%jobs}
@@ -111,6 +112,7 @@ rm -rf %{buildroot}
 %{RESDIR}/icons/*
 %{RESDIR}/edje/*
 /usr/share/packages/%{PKGNAME}.xml
+%attr(775,app,app) %{PREFIXRW}/data
 %attr(755,-,-) %{_sysconfdir}/init.d/indicator
 /usr/share/license/%{PKGNAME}
 /usr/apps/%{PKGNAME}/author-signature.xml