Resolve path conflict.

Create DATA folder for labeling it by SMACK.

Change-Id: Ice0ac0e8636eb33602f3481772c0d3795d13f7f9

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f900c5e..f419d18 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,6 @@ pkg_check_modules(MENU_PKGS REQUIRED
        pkgmgr
        pkgmgr-info
        shortcut
-       sysman
        syspopup-caller
 )
 
@@ -84,9 +83,18 @@ ADD_EXECUTABLE(${PROJECT_NAME}
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} -lm)
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${MENU_PKGS_LDFLAGS})
 
-# Install 
+FILE(MAKE_DIRECTORY
+       data
+       dbspace
+       shortcut
+)
+
+# Install
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${EXEC_PREFIX})
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.Flora DESTINATION /usr/share/license RENAME ${PACKAGE_NAME})
+INSTALL(DIRECTORY data DESTINATION ${PREFIX})
+INSTALL(DIRECTORY dbspace DESTINATION ${DATADIR})
+INSTALL(DIRECTORY shortcut DESTINATION ${DATADIR})
 
 ADD_SUBDIRECTORY(data)
 

diff --git a/packaging/org.tizen.menu-screen.spec b/packaging/org.tizen.menu-screen.spec
index c4d0854..fc6c396 100644 (file)
--- a/packaging/org.tizen.menu-screen.spec
+++ b/packaging/org.tizen.menu-screen.spec
@@ -1,84 +1,54 @@
-%define _optdir /opt
-%define _usrdir /usr
-%define _appdir %{_usrdir}/apps
-%define _usr_datadir %{_usrdir}/share
-
-%define _project_name menu-screen
-%define _package_name org.tizen.%{_project_name}
-
-%define _packagedir %{_appdir}/%{_package_name}
-%define _bindir %{_packagedir}/bin
-%define _datadir %{_optdir}%{_packagedir}/data
-%define _resdir %{_packagedir}/res
-%define _sharedir %{_packagedir}/share
-
-%define _localedir %{_resdir}/locale
-
-Name:       org.tizen.menu-screen
-Summary:    An utility library of the menu screen
-Version:    1.1.1
-Release:    1.1
-Group:      TO_BE/FILLED_IN
-License:    Flora Software License
-Source0:    %{name}-%{version}.tar.gz
-Source1001:    org.tizen.menu-screen.manifest
-BuildRequires:  pkgconfig(ail)
-BuildRequires:  pkgconfig(appcore-efl)
-BuildRequires:  pkgconfig(appsvc)
-BuildRequires:  pkgconfig(aul)
-BuildRequires:  pkgconfig(badge)
-BuildRequires:  pkgconfig(bundle)
-BuildRequires:  pkgconfig(capi-appfw-application)
-BuildRequires:  pkgconfig(capi-system-info)
-BuildRequires:  pkgconfig(dlog)
-BuildRequires:  pkgconfig(ecore)
-BuildRequires:  pkgconfig(ecore-evas)
-BuildRequires:  pkgconfig(ecore-file)
-BuildRequires:  pkgconfig(ecore-imf)
-BuildRequires:  pkgconfig(ecore-input)
-BuildRequires:  pkgconfig(edje)
-BuildRequires:  pkgconfig(eet)
-BuildRequires:  pkgconfig(eina)
-BuildRequires:  pkgconfig(elementary)
-BuildRequires:  pkgconfig(evas)
-BuildRequires:  pkgconfig(heynoti)
-BuildRequires:  pkgconfig(pkgmgr)
-BuildRequires:  pkgconfig(pkgmgr-info)
-BuildRequires:  pkgconfig(shortcut)
-BuildRequires:  pkgconfig(sysman)
-BuildRequires:  pkgconfig(syspopup-caller)
-BuildRequires:  cmake
-BuildRequires:  edje-tools
-BuildRequires:  gettext-tools
-
+Name: org.tizen.menu-screen
+Summary: Menu screen
+Version: 1.1.1
+Release: 1.1
+Group: Applications/Core Applications
+License: Flora
+Source0: %{name}-%{version}.tar.gz
+Source1001: %{name}.manifest
+BuildRequires: pkgconfig(ail)
+BuildRequires: pkgconfig(appcore-efl)
+BuildRequires: pkgconfig(appsvc)
+BuildRequires: pkgconfig(aul)
+BuildRequires: pkgconfig(badge)
+BuildRequires: pkgconfig(bundle)
+BuildRequires: pkgconfig(capi-appfw-application)
+BuildRequires: pkgconfig(capi-system-info)
+BuildRequires: pkgconfig(dlog)
+BuildRequires: pkgconfig(ecore)
+BuildRequires: pkgconfig(ecore-evas)
+BuildRequires: pkgconfig(ecore-file)
+BuildRequires: pkgconfig(ecore-imf)
+BuildRequires: pkgconfig(ecore-input)
+BuildRequires: pkgconfig(edje)
+BuildRequires: pkgconfig(eet)
+BuildRequires: pkgconfig(eina)
+BuildRequires: pkgconfig(elementary)
+BuildRequires: pkgconfig(evas)
+BuildRequires: pkgconfig(heynoti)
+BuildRequires: pkgconfig(pkgmgr)
+BuildRequires: pkgconfig(pkgmgr-info)
+BuildRequires: pkgconfig(shortcut)
+BuildRequires: pkgconfig(syspopup-caller)
+BuildRequires: cmake
+BuildRequires: edje-tools
+BuildRequires: gettext-tools
 
 %description
-An utility library for developers of the menu screen.
-
-
-
-%package devel
-Summary:    An utility library of the menu screen (devel)
-Group:      Development/Libraries
-Requires:   %{name} = %{version}-%{release}
-
-%description devel
-An utility library for developers of the menu screen (devel)
-
+Tizen 2.x Reference Application.
+User application for launching apps.
 
 %prep
 %setup -q
 cp %{SOURCE1001} .
 
 %build
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
-CFLAGS="${CFLAGS} -Wall -Werror" LDFLAGS="${LDFLAGS} -Wl,--hash-style=both -Wl,--as-needed"
+%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}/apps/%{name}/
 make %{?jobs:-j%jobs}
 
 %install
 %make_install
-mkdir -p %{buildroot}%{_datadir}
-mkdir -p %{buildroot}/usr/share/license
+mkdir -p %{buildroot}/%{_datarootdir}/license
 
 %post
 INHOUSE_ID="5000"
@@ -91,18 +61,6 @@ init_vconf()
 }
 init_vconf
 
-if [ ! -d %{_datadir}/dbspace ]
-then
-       mkdir -p %{_datadir}/dbspace
-fi
-
-if [ ! -d %{_datadir}/shortcut ]
-then
-       mkdir -p %{_datadir}/shortcut
-else
-       rm -rf %{_datadir}/shortcut/*
-fi
-
 sqlite3 %{_datadir}/dbspace/.menu_screen.db 'PRAGMA journal_mode = PERSIST;
        create table if not exists shortcut (
                ROWID INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -125,14 +83,7 @@ chmod 660 %{_datadir}/dbspace/.menu_screen.db-journal
 %files
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-%{_bindir}/menu-screen
-%{_resdir}/edje/all_apps_portrait.edj
-%{_resdir}/edje/button_edit.edj
-%{_resdir}/edje/group_4x4_portrait.edj
-%{_resdir}/edje/item_4x4.edj
-%{_resdir}/edje/layout_portrait.edj
-%{_resdir}/edje/index.edj
-%{_resdir}/images/default.png
-%{_localedir}/*/*/*.mo
-%{_usr_datadir}/packages/org.tizen.menu-screen.xml
-%{_usr_datadir}/license/%{name}
+/opt/usr/apps/%{name}/*
+%{_prefix}/apps/%{name}/*
+%{_datarootdir}/packages/%{name}.xml
+%{_datarootdir}/license/%{name}