remove manifest file

Change-Id: I7e9b32d2dbdc60360a44aa6fc2de07113f805d8d
Signed-off-by: Jehun Lim <jehun.lim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1d36b5d..1962dd5 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,9 +50,9 @@ ENDIF(NOT DEFINED LOCALEDIR)
 IF(NOT DEFINED IMAGEDIR)
   SET(IMAGEDIR "${PREFIX}/res/images")
 ENDIF(NOT DEFINED IMAGEDIR)
-IF(NOT DEFINED MANIFESTDIR)
-       SET(MANIFESTDIR "/usr/share/packages")
-ENDIF(NOT DEFINED MANIFESTDIR)
+IF(NOT DEFINED PACKAGEDIR)
+       SET(PACKAGEDIR "/usr/share/packages")
+ENDIF(NOT DEFINED PACKAGEDIR)
 IF(NOT DEFINED DESKTOP_ICONDIR)
        SET(DESKTOP_ICONDIR "/usr/share/icons/default/small")
 ENDIF(NOT DEFINED DESKTOP_ICONDIR)
@@ -111,8 +111,7 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${PKGS_LDFLAGS})
 CONFIGURE_FILE(${PACKAGE_NAME}.xml.in ${PACKAGE_NAME}.xml)
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
-INSTALL(FILES ${PACKAGE_NAME}.xml DESTINATION ${MANIFESTDIR})
-INSTALL(FILES ${PACKAGE_NAME}.manifest DESTINATION ${MANIFESTDIR})
+INSTALL(FILES ${PACKAGE_NAME}.xml DESTINATION ${PACKAGEDIR})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/${DESKTOP_ICON} DESTINATION ${DESKTOP_ICONDIR})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/${DESKTOP_ICON_4X2} DESTINATION ${DESKTOP_ICONDIR})
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/images DESTINATION ${RESDIR})

diff --git a/org.tizen.gallery-tv-ref.manifest b/org.tizen.gallery-tv-ref.manifest
deleted file mode 100644 (file)
index 64690f4..0000000
--- a/org.tizen.gallery-tv-ref.manifest
+++ /dev/null
@@ -1,22 +0,0 @@
-<manifest>
-    <define>
-        <domain name="dtv-org.tizen.gallery-tv-ref"/>
-               <request>
-                       <smack request="device::app_logging" type="rw"/>
-                       <smack request="system::vconf" type="rxl"/>
-                       <smack request="system::homedir" type="rx"/>
-                       <smack request="system::use_internet" type="r"/>
-                       <smack request="xorg" type="rwx"/>
-                       <smack request="isf" type="rx"/>
-                       <smack request="e17" type="rxl"/>
-                       <smack request="dtv-org.tizen.btapp" type="rx"/>
-                       <smack request="ail::db" type="rxl"/>
-                       <smack request="system::media" type="rx"/>
-                       <smack request="media-data::db" type="rw"/>
-                       <smack request="media-server" type="rw"/>
-               </request>
-    </define>
-    <request>
-        <domain name="dtv-org.tizen.gallery-tv-ref"/>
-    </request>
-</manifest>

diff --git a/packaging/org.tizen.gallery-tv-ref.spec b/packaging/org.tizen.gallery-tv-ref.spec
index 2dfc107..3e51a63 100644 (file)
--- a/packaging/org.tizen.gallery-tv-ref.spec
+++ b/packaging/org.tizen.gallery-tv-ref.spec
@@ -20,12 +20,12 @@ BuildRequires: pkgconfig(application-common)
 BuildRequires: gettext-devel
 BuildRequires: edje-bin
 
-%define _pkgdir /usr/apps/%{name}
-%define _bindir %{_pkgdir}/bin
-%define _resdir %{_pkgdir}/res
-%define _datadir %{_pkgdir}/data
+%define _appdir /usr/apps/%{name}
+%define _bindir %{_appdir}/bin
+%define _resdir %{_appdir}/res
+%define _datadir %{_appdir}/data
 %define _localedir %{_resdir}/locale
-%define _manifestdir /usr/share/packages
+%define _pkgdir %{_datadir}/packages
 %define _desktop_icondir /usr/share/icons/default/small
 
 %description
@@ -36,11 +36,11 @@ Gallery Application
 
 %build
 cmake \
-       -DCMAKE_INSTALL_PREFIX=%{_pkgdir} \
+       -DCMAKE_INSTALL_PREFIX=%{_appdir} \
        -DPACKAGE_NAME=%{name} \
        -DBINDIR=%{_bindir} \
        -DLOCALEDIR=%{_localedir} \
-       -DMANIFESTDIR=%{_manifestdir} \
+       -DPACKAGEDIR=%{_pkgdir} \
        -DDESKTOP_ICONDIR=%{_desktop_icondir} \
        -DDESKTOP_ICON=%{name}.png \
        -DDESKTOP_ICON_4X2=%{name}_4x2.png \
@@ -57,11 +57,10 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%manifest %{_manifestdir}/%{name}.manifest
 %{_bindir}/*
 %{_resdir}/*
 %{_datadir}
-%{_manifestdir}/%{name}.xml
+%{_pkgdir}/%{name}.xml
 %{_desktop_icondir}/%{name}.png
 %{_desktop_icondir}/%{name}_4x2.png
 %defattr(-,app,app,-)