Change indicator data directory

Change-Id: I4259c6e44ed7dd723a257621285653fff7a1211f

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03e6cc3..8f7a7c9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,10 +9,9 @@ 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 "${PREFIXRW}/data")
+SET(DATADIR "${PREFIX}/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 ac3f7be..0093ca2 100644 (file)
--- a/packaging/org.tizen.indicator.spec
+++ b/packaging/org.tizen.indicator.spec
@@ -1,7 +1,6 @@
 %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
@@ -80,7 +79,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} -DCMAKE_INSTALL_PREFIXRW=%{PREFIXRW} \
+cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX}
 
 
 make %{?jobs:-j%jobs}
@@ -112,7 +111,6 @@ 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