Create DATA folder for SMACK labeling. (PATCH CONFLICT RESOLVED)

Change-Id: I6ed83582d2cda9e9a85e50b58c88658a16a1dda2

diff --git a/contacts-appservice/CMakeLists.txt b/contacts-appservice/CMakeLists.txt
index e32d970..5f43d9b 100644 (file)
--- a/contacts-appservice/CMakeLists.txt
+++ b/contacts-appservice/CMakeLists.txt
@@ -27,3 +27,6 @@ INSTALL(DIRECTORY DESTINATION ${APPSERVICE_DATADIR})
 
 # install icon
 INSTALL(FILES icon_${APPSERVICE}.png DESTINATION "/usr/share/icons/default/small" RENAME "${APPSERVICE_PKGNAME}.png")
+
+FILE(MAKE_DIRECTORY data)
+INSTALL(DIRECTORY data DESTINATION "/opt/usr/apps/${APPSERVICE_PKGNAME}")

diff --git a/contacts-viewer/CMakeLists.txt b/contacts-viewer/CMakeLists.txt
index 718471f..97836af 100644 (file)
--- a/contacts-viewer/CMakeLists.txt
+++ b/contacts-viewer/CMakeLists.txt
@@ -21,6 +21,8 @@ TARGET_LINK_LIBRARIES(${VIEWER} ug-contacts-details-efl ug-contacts-list-efl "-p
 INSTALL(FILES ${CMAKE_BINARY_DIR}/contacts-viewer/org.tizen.contacts-viewer.xml DESTINATION "/usr/share/packages")
 INSTALL(TARGETS ${VIEWER} DESTINATION ${VV_BINDIR})
 INSTALL(DIRECTORY DESTINATION ${VV_DATADIR})
+FILE(MAKE_DIRECTORY data)
+INSTALL(DIRECTORY data DESTINATION "/opt/usr/apps/${VV_PKGNAME}")
 
 # install icon
 INSTALL(FILES icon_${VIEWER}.png DESTINATION "/usr/share/icons/default/small" RENAME "${VV_PKGNAME}.png")

diff --git a/contacts/CMakeLists.txt b/contacts/CMakeLists.txt
index e3802a4..764572c 100644 (file)
--- a/contacts/CMakeLists.txt
+++ b/contacts/CMakeLists.txt
@@ -21,3 +21,6 @@ INSTALL(FILES ${CMAKE_BINARY_DIR}/${CONTACTS}/${CONTACTS_PKGNAME}.xml DESTINATIO
 INSTALL(FILES icon_${CONTACTS}.png DESTINATION "/usr/share/icons/default/small" RENAME "${CONTACTS_PKGNAME}.png")
 INSTALL(TARGETS ${CONTACTS} DESTINATION /usr/apps/${CONTACTS_PKGNAME}/bin)
 INSTALL(DIRECTORY DESTINATION /usr/apps/${CONTACTS_PKGNAME}/data)
+
+FILE(MAKE_DIRECTORY data)
+INSTALL(DIRECTORY data DESTINATION "/opt/usr/apps/${CONTACTS_PKGNAME}")

diff --git a/packaging/phone.spec b/packaging/phone.spec
index 10a602d..a39bae8 100755 (executable)
--- a/packaging/phone.spec
+++ b/packaging/phone.spec
@@ -1,107 +1,114 @@
-Name:       phone
-Summary:    Phone Application and gadgets
-Version:    0.6.63.25
-Release:    1
-Group:      devel
-License:    Flora Software License
-URL:        N/A
-Source0:    %{name}-%{version}.tar.gz
-BuildRequires:  pkgconfig(appcore-efl)
-BuildRequires:  pkgconfig(contacts-service2)
-BuildRequires:  pkgconfig(dlog)
-BuildRequires:  pkgconfig(heynoti)
-BuildRequires:  pkgconfig(ui-gadget-1)
-BuildRequires:  pkgconfig(tapi)
-BuildRequires:  pkgconfig(icu-i18n)
-BuildRequires:  pkgconfig(notification)
-BuildRequires:  pkgconfig(ecore-x)
-BuildRequires:  pkgconfig(ecore-input)
-BuildRequires:  pkgconfig(ecore)
-BuildRequires:  pkgconfig(evas)
-BuildRequires:  pkgconfig(eina)
-BuildRequires:  pkgconfig(libprivilege-control)
-BuildRequires:  pkgconfig(accounts-svc)
-BuildRequires:  pkgconfig(msg-service)
-BuildRequires:  pkgconfig(syspopup-caller)
-BuildRequires:  pkgconfig(capi-appfw-application)
-BuildRequires:  pkgconfig(capi-system-runtime-info)
-#BuildRequires:  pkgconfig(capi-uix-feedback)
-BuildRequires:  pkgconfig(feedback)
-BuildRequires:  pkgconfig(cert-svc)
-BuildRequires:  pkgconfig(cert-svc-vcore)
+Name: phone
+Summary: Phone Application and gadgets
+Version: 0.6.63.25
+Release: 1
+Group: devel
+License: Flora
+URL: N/A
+Source0: %{name}-%{version}.tar.gz
+BuildRequires: pkgconfig(appcore-efl)
+BuildRequires: pkgconfig(contacts-service2)
+BuildRequires: pkgconfig(dlog)
+BuildRequires: pkgconfig(heynoti)
+BuildRequires: pkgconfig(ui-gadget-1)
+BuildRequires: pkgconfig(tapi)
+BuildRequires: pkgconfig(icu-i18n)
+BuildRequires: pkgconfig(notification)
+BuildRequires: pkgconfig(ecore-x)
+BuildRequires: pkgconfig(ecore-input)
+BuildRequires: pkgconfig(ecore)
+BuildRequires: pkgconfig(evas)
+BuildRequires: pkgconfig(eina)
+BuildRequires: pkgconfig(libprivilege-control)
+BuildRequires: pkgconfig(accounts-svc)
+BuildRequires: pkgconfig(msg-service)
+BuildRequires: pkgconfig(syspopup-caller)
+BuildRequires: pkgconfig(capi-appfw-application)
+BuildRequires: pkgconfig(capi-system-runtime-info)
+#BuildRequires: pkgconfig(capi-uix-feedback)
+BuildRequires: pkgconfig(feedback)
+BuildRequires: pkgconfig(cert-svc)
+BuildRequires: pkgconfig(cert-svc-vcore)
 BuildRequires: pkgconfig(capi-appfw-app-manager)
-BuildRequires:  pkgconfig(capi-system-info)
+BuildRequires: pkgconfig(capi-system-info)
 BuildRequires: pkgconfig(capi-content-media-content)
 BuildRequires: pkgconfig(utilX)
 
-BuildRequires:  cmake
-BuildRequires:  edje-bin
-BuildRequires:  embryo-bin
-BuildRequires:  gettext-devel
+BuildRequires: cmake
+BuildRequires: edje-bin
+BuildRequires: embryo-bin
+BuildRequires: gettext-devel
 
 %description
-Phone application.
+Tizen 2.x Reference applications.
+Phone and its related packages are included.
 
 %package -n org.tizen.phone
-Summary:    Phone application
-Group:      Development/Libraries
+Summary: Phone application
+Group: Development/Libraries
 
 %description -n org.tizen.phone
+Tizen 2.x Reference applications.
 Phone application.
 
 %package -n org.tizen.contacts
-Summary:    Contacts launcher
-Group:      Development/Libraries
+Summary: Contacts launcher
+Group: Development/Libraries
 Requires: libmm-sound
 Requires: ug-bluetooth-efl
 
 %description -n org.tizen.contacts
-Contacts launcher
+Tizen 2.x Reference applications.
+Contacts application.
 
 %package -n org.tizen.contacts-appservice
-Summary:    Contacts appservice
-Group:      Development/Libraries
+Summary: Contacts appservice
+Group: Development/Libraries
 
 %description -n org.tizen.contacts-appservice
-Contacts appservice
+Tizen 2.x Reference applications.
+Contacts Application Service.
 
 %package -n org.tizen.contacts-viewer
-Summary:    Contacts viewer application
-Group:      Development/Libraries
+Summary: Contacts viewer application
+Group: Development/Libraries
 
 %description -n org.tizen.contacts-viewer
-Contacts viewer application
+Tizen 2.x Reference applications.
+Contacts viewer application.
 
 %package -n libug-phone-efl
-Summary:    Phone UI gadget library
-Group:      devel
+Summary: Phone UI gadget library
+Group: devel
 
 %description -n libug-phone-efl
+Tizen 2.x Reference applications.
 Phone UI gadget library.
 
 %package -n libug-contacts-devel
-Summary:    Phone UI gadget Header
-Group:      devel
-Requires:   libug-phone-efl = %{version}-%{release}
+Summary: Phone UI gadget Header
+Group: devel
+Requires: libug-phone-efl = %{version}-%{release}
 
 %description -n libug-contacts-devel
+Tizen 2.x Reference applications.
 Phone UI gadget Header.
 
 %package -n libug-phone-devel
-Summary:    Phone UI gadget Header
-Group:      devel
-Requires:   libug-phone-efl = %{version}-%{release}
+Summary: Phone UI gadget Header
+Group: devel
+Requires: libug-phone-efl = %{version}-%{release}
 
 %description -n libug-phone-devel
+Tizen 2.x Reference applications.
 Phone UI gadget Header.
 
-
 %prep
 %setup -q
 
 %build
-%define PREFIX    "/usr/apps/org.tizen.phone"
-cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX}
+%define PREFIX "%{_prefix}/apps/org.tizen.phone"
+%cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX}
 make %{?jobs:-j%jobs}
 
 %install
@@ -114,21 +121,21 @@ mkdir -p /opt/usr/ug/data
 mkdir -p /opt/usr/ug/data/ug-phone
 chgrp 6005 -R /opt/usr/ug/data/ug-phone
 chmod 770 -R /opt/usr/ug/data/ug-phone
-mkdir -p /usr/ug/bin/
-ln -sf /usr/bin/ug-client /usr/ug/bin/contacts-details-efl
-ln -sf /usr/bin/ug-client /usr/ug/bin/contacts-list-efl
-ln -sf /usr/bin/ug-client /usr/ug/bin/contacts-settings-efl
-ln -sf /usr/bin/ug-client /usr/ug/bin/contacts-tabui-efl
-ln -sf /usr/bin/ug-client /usr/ug/bin/dialer-efl
-ln -sf /usr/bin/ug-client /usr/ug/bin/phone-tabui-efl
-ln -sf /usr/bin/ug-client /usr/ug/bin/speeddial-efl
+mkdir -p %{_prefix}/ug/bin/
+ln -sf %{_prefix}/bin/ug-client %{_prefix}/ug/bin/contacts-details-efl
+ln -sf %{_prefix}/bin/ug-client %{_prefix}/ug/bin/contacts-list-efl
+ln -sf %{_prefix}/bin/ug-client %{_prefix}/ug/bin/contacts-settings-efl
+ln -sf %{_prefix}/bin/ug-client %{_prefix}/ug/bin/contacts-tabui-efl
+ln -sf %{_prefix}/bin/ug-client %{_prefix}/ug/bin/dialer-efl
+ln -sf %{_prefix}/bin/ug-client %{_prefix}/ug/bin/phone-tabui-efl
+ln -sf %{_prefix}/bin/ug-client %{_prefix}/ug/bin/speeddial-efl
 
 %postun -n libug-phone-efl -p /sbin/ldconfig
 
 %post -n org.tizen.phone
 /sbin/ldconfig
 mkdir /opt/usr/apps/org.tizen.phone
-cp -fr /usr/apps/org.tizen.phone/data /opt/usr/apps/org.tizen.phone
+cp -fr %{_prefix}/apps/org.tizen.phone/data /opt/usr/apps/org.tizen.phone
 chown -R 5000:5000 /opt/usr/apps/org.tizen.phone/data
 
 %postun -n org.tizen.phone -p /sbin/ldconfig
@@ -136,70 +143,73 @@ chown -R 5000:5000 /opt/usr/apps/org.tizen.phone/data
 %post -n org.tizen.contacts
 /sbin/ldconfig
 mkdir -p /opt/usr/apps/org.tizen.contacts
-cp -fr /usr/apps/org.tizen.contacts/data /opt/usr/apps/org.tizen.contacts
+cp -fr %{_prefix}/apps/org.tizen.contacts/data /opt/usr/apps/org.tizen.contacts
 chown -R 5000:5000 /opt/usr/apps/org.tizen.contacts/data
 
 %postun -n org.tizen.contacts -p /sbin/ldconfig
 
 %post -n org.tizen.contacts-viewer
 mkdir -p /opt/usr/apps/org.tizen.contacts-viewer
-cp -fr /usr/apps/org.tizen.contacts-viewer/data /opt/usr/apps/org.tizen.contacts-viewer
+cp -fr %{_prefix}/apps/org.tizen.contacts-viewer/data /opt/usr/apps/org.tizen.contacts-viewer
 chown -R 5000:5000 /opt/usr/apps/org.tizen.contacts-viewer/data
 
 %files -n org.tizen.phone
 %manifest org.tizen.phone.manifest
 %defattr(-,root,root,-)
-/usr/apps/org.tizen.phone/*
+%{_prefix}/apps/org.tizen.phone/*
 #/usr/share/packages/org.tizen.phone.xml
-/usr/share/icons/default/small/org.tizen.phone.png
-/usr/ug/lib/libug-speeddial-efl.*
-/usr/ug/lib/libug-dialer-efl.*
-/usr/ug/lib/libug-phone-tabui-efl.*
+%{_prefix}/share/icons/default/small/org.tizen.phone.png
+%{_prefix}/ug/lib/libug-speeddial-efl.*
+%{_prefix}/ug/lib/libug-dialer-efl.*
+%{_prefix}/ug/lib/libug-phone-tabui-efl.*
 #/opt/share/applications/*.desktop
-/usr/share/packages/*.xml
-
+%{_prefix}/share/packages/*.xml
+/opt/usr/apps/org.tizen.phone/*
 
 %files -n org.tizen.contacts
 %manifest org.tizen.contacts.manifest
 %defattr(-,root,root,-)
-/usr/apps/org.tizen.contacts/*
-#/usr/share/packages/org.tizen.contacts.xml
-/usr/share/icons/default/small/org.tizen.contacts.png
-/usr/ug/lib/libug-contacts-tabui-efl.*
-/usr/ug/lib/libug-contacts-settings-efl.*
+%{_prefix}/apps/org.tizen.contacts/*
+#%{_prefix}/share/packages/org.tizen.contacts.xml
+%{_prefix}/share/icons/default/small/org.tizen.contacts.png
+%{_prefix}/ug/lib/libug-contacts-tabui-efl.*
+%{_prefix}/ug/lib/libug-contacts-settings-efl.*
 #/opt/share/applications/*.desktop
-/usr/share/packages/*.xml
+%{_prefix}/share/packages/*.xml
 #/usr/share/locale/*
+/opt/usr/apps/org.tizen.contacts/*
 
 %files -n org.tizen.contacts-appservice
 %manifest org.tizen.contacts-appservice.manifest
 %defattr(-,root,root,-)
-/usr/apps/org.tizen.contacts-appservice/*
-/usr/share/packages/org.tizen.contacts-appservice.xml
-/usr/share/icons/default/small/org.tizen.contacts-appservice.png
+%{_prefix}/apps/org.tizen.contacts-appservice/*
+%{_prefix}/share/packages/org.tizen.contacts-appservice.xml
+%{_prefix}/share/icons/default/small/org.tizen.contacts-appservice.png
+/opt/usr/apps/org.tizen.contacts-appservice/*
 
 %files -n org.tizen.contacts-viewer
 %manifest org.tizen.contacts-viewer.manifest
 %defattr(-,root,root,-)
-/usr/apps/org.tizen.contacts-viewer/*
-/usr/share/packages/org.tizen.contacts-viewer.xml
-/usr/share/icons/default/small/org.tizen.contacts-viewer.png
-#/usr/share/locale/*
+%{_prefix}/apps/org.tizen.contacts-viewer/*
+%{_prefix}/share/packages/org.tizen.contacts-viewer.xml
+%{_prefix}/share/icons/default/small/org.tizen.contacts-viewer.png
+#%{_prefix}/share/locale/*
+/opt/usr/apps/org.tizen.contacts-viewer/*
 
 %files -n libug-phone-efl
 %manifest libug-phone-efl.manifest
 %defattr(-,root,root,-)
-/usr/ug/res/images/*
-/usr/ug/res/edje/*
-/usr/ug/res/locale/*
-/usr/ug/lib/libug-contacts-list-efl.*
-/usr/ug/lib/libug-contacts-details-efl.*
-/usr/ug/lib/libug-phonelog-efl.*
+%{_prefix}/ug/res/images/*
+%{_prefix}/ug/res/edje/*
+%{_prefix}/ug/res/locale/*
+%{_prefix}/ug/lib/libug-contacts-list-efl.*
+%{_prefix}/ug/lib/libug-contacts-details-efl.*
+%{_prefix}/ug/lib/libug-phonelog-efl.*
 
 %files -n libug-contacts-devel
 %defattr(-,root,root,-)
-/usr/include/contacts-ug.h
+%{_prefix}/include/contacts-ug.h
 
 %files -n libug-phone-devel
 %defattr(-,root,root,-)
-/usr/include/phone-ug.h
+%{_prefix}/include/phone-ug.h

diff --git a/phone/CMakeLists.txt b/phone/CMakeLists.txt
index 0b1e0aa..ba79bf1 100644 (file)
--- a/phone/CMakeLists.txt
+++ b/phone/CMakeLists.txt
@@ -10,3 +10,5 @@ INSTALL(FILES ${CMAKE_BINARY_DIR}/phone/org.tizen.phone.xml DESTINATION "/usr/sh
 INSTALL(FILES icon_${PROJECT_NAME}.png DESTINATION "/usr/share/icons/default/small" RENAME "${PKGNAME}.png")
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
 
+FILE(MAKE_DIRECTORY data)
+INSTALL(DIRECTORY data DESTINATION "/opt/usr/apps/org.tizen.phone")