Add multiuser support

Change-Id: I70e3523cdfd9c1eef0198594ba58b0cec420a65e
Signed-off-by: Prakash <prakashc.p@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c84cd9d215238ab11ae91dad03ec0d7da0bfc17..8810b817795aa4126b7a4f15c5e878f5af8d9dcf 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@ SET(BINDIR "${PREFIX}/bin")
 SET(RESDIR "${PREFIX}/res")
 SET(DATADIR "${PREFIX}/data")
 SET(LOCALEDIR "${RESDIR}/locale")
-SET(ICONDIR "/usr/share/icons/default/small")
+SET(ICONDIR "${CMAKE_APP_ICON_DIR}")
 SET(EDJDIR "${RESDIR}/edje")
 
 IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
@@ -61,6 +61,7 @@ pkg_check_modules(pkgs REQUIRED
        capi-content-media-content
        capi-system-system-settings
        capi-appfw-widget-application
+       libtzplatform-config
 )
 
 FOREACH(flag ${pkgs_CFLAGS})
@@ -126,18 +127,12 @@ INSTALL(FILES ${CMAKE_BINARY_DIR}/gallery.edj DESTINATION ${EDJDIR})
 INSTALL(FILES ${CMAKE_BINARY_DIR}/gl-images.edj DESTINATION ${EDJDIR})
 
 # install manifest file & icon
-INSTALL(FILES ${CMAKE_BINARY_DIR}/${PKGNAME}.xml DESTINATION /usr/share/packages)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/${PKGNAME}.xml DESTINATION ${CMAKE_APP_SHARE_PACKAGES_DIR})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/${RSRC_DIR}/icon/${PKGNAME}.png DESTINATION ${ICONDIR})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/widget/res/preview_gallery_4x4.png DESTINATION ${ICONDIR})
 
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/black_theme/images DESTINATION ${RESDIR})
 
-# install content shortcut uri file
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/${RSRC_DIR}/gallery.uri DESTINATION /usr/share/miregex)
-
-# install application HOME directory
-INSTALL(DIRECTORY DESTINATION /opt/usr/apps/${PKGNAME}/data)
-
 # i18n
 ADD_SUBDIRECTORY(res/po)
 ADD_SUBDIRECTORY(widget)

diff --git a/INSTALL b/INSTALL
deleted file mode 100755 (executable)
index 3f81c54..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,33 +0,0 @@
-1. make the build directory
-
-  ex) 
-
-   $ mkdir build
-
-
-2. change the working directory to the build directory
-
-  ex)
-
-   $ cd build
-
-
-3. run 'cmake'
-
-  $ cmake ${SOURCE_DIR} -DCMAKE_INSTALL_PREFIX=/opt/apps/@@PKGNAME@@
-
-  ex)
-
-   $ cmake .. -DCMAKE_INSTALL_PREFIX=/opt/apps/@@PKGNAME@@
-
-   or
-
-   $ cmake ..
-
-
-4. make & make install
-
-  ex)
-
-   $ make -j 2 && make install
-

diff --git a/packaging/org.tizen.gallery.spec b/packaging/org.tizen.gallery.spec
index d7118bf5032510c57e08a28d0a51a446c9306071..36d439afd304b4111e88521a8dfa0299dfa2b2a6 100755 (executable)
--- a/packaging/org.tizen.gallery.spec
+++ b/packaging/org.tizen.gallery.spec
@@ -1,10 +1,3 @@
-%define _optdir        /opt/usr
-%define _usrdir        /usr
-%define _appdir        %{_usrdir}/apps
-%define _appdatadir    %{_optdir}/apps
-
-%define _datadir /opt%{_ugdir}/data
-%define _sharedir /opt/usr/media/.iv
 Name:       org.tizen.gallery
 Summary:    org.tizen.gallery UX
 Version:    1.3.21
@@ -40,6 +33,7 @@ BuildRequires: pkgconfig(widget_service)
 BuildRequires: pkgconfig(widget)
 BuildRequires: pkgconfig(widget_provider)
 BuildRequires: pkgconfig(widget_provider_app)
+BuildRequires: pkgconfig(libtzplatform-config)
 
 %description
 Description: org.tizen.gallery UX
@@ -49,6 +43,11 @@ Description: org.tizen.gallery UX
 
 %build
 
+%define _appdir        %{TZ_SYS_RO_APP}
+%define _app_icon_dir             %{TZ_SYS_RO_ICONS}/default/small
+%define _app_share_packages_dir   %{TZ_SYS_RO_PACKAGES}
+%define _app_license_dir          %{TZ_SYS_SHARE}/license
+
 %if 0%{?tizen_build_binary_release_type_eng}
 export CFLAGS="$CFLAGS -DTIZEN_ENGINEER_MODE"
 export CXXFLAGS="$CXXFLAGS -DTIZEN_ENGINEER_MODE"
@@ -59,38 +58,30 @@ export FFLAGS="$FFLAGS -DTIZEN_ENGINEER_MODE"
 CXXFLAGS+=" -D_ARCH_ARM_ -mfpu=neon"
 %endif
 
-cmake . -DCMAKE_INSTALL_PREFIX=%{_appdir}/org.tizen.gallery  -DCMAKE_DATA_DIR=%{_datadir} -DARCH=%{ARCH}
+cmake . -DCMAKE_INSTALL_PREFIX=%{_appdir}/org.tizen.gallery \
+       -DARCH=%{ARCH} \
+       -DCMAKE_APP_ICON_DIR=%{_app_icon_dir} \
+       -DCMAKE_APP_SHARE_PACKAGES_DIR=%{_app_share_packages_dir}
 
 make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}
-if [ ! -d %{buildroot}/opt/usr/apps/org.tizen.gallery/data ]
-then
-        mkdir -p %{buildroot}/opt/usr/apps/org.tizen.gallery/data
-fi
 
 %make_install
 
-mkdir -p %{buildroot}/usr/share/license
-mkdir -p %{buildroot}%{_sharedir}
-cp LICENSE %{buildroot}/usr/share/license/org.tizen.gallery
-
-%post
-chown -R 5000:5000 %{_appdatadir}/org.tizen.gallery/data
-%postun
+mkdir -p %{buildroot}%{_app_license_dir}
+cp LICENSE %{buildroot}%{_app_license_dir}/org.tizen.gallery
 
 %files -n org.tizen.gallery
 %manifest org.tizen.gallery.manifest
 %defattr(-,root,root,-)
 %{_appdir}/org.tizen.gallery/bin/*
 %{_appdir}/org.tizen.gallery/res/locale/*
-/usr/share/icons/default/small/org.tizen.gallery.png
-/usr/share/icons/default/small/preview_gallery_4x4.png
+%{TZ_SYS_RO_ICONS}/default/small/org.tizen.gallery.png
+%{TZ_SYS_RO_ICONS}/default/small/preview_gallery_4x4.png
 %{_appdir}/org.tizen.gallery/res/images/*
 %{_appdir}/org.tizen.gallery/res/edje/*
-%{_appdatadir}/org.tizen.gallery/data
-/usr/share/packages/org.tizen.gallery.xml
-/usr/share/miregex/*
-/usr/share/license/org.tizen.gallery
+%{TZ_SYS_RO_PACKAGES}/org.tizen.gallery.xml
+%{TZ_SYS_SHARE}/license/org.tizen.gallery
 

diff --git a/res/gallery.uri b/res/gallery.uri
deleted file mode 100755 (executable)
index 721d80e..0000000
--- a/res/gallery.uri
+++ /dev/null
@@ -1,2 +0,0 @@
-(^( )*gallery:)([a-zA-Z0-9]+)
-Gallery Album Shortcut Internal