remove manifest file

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53adce3..e1f9bfe 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,9 +33,9 @@ ENDIF(NOT DEFINED EDJEDIR)
 IF(NOT DEFINED LOCALEDIR)
        SET(LOCALEDIR "${PREFIX}/res/locale")
 ENDIF(NOT DEFINED LOCALEDIR)
-IF(NOT DEFINED MANIFESTDIR)
-       SET(MANIFESTDIR "${PREFIX}/share/packages")
-ENDIF(NOT DEFINED MANIFESTDIR)
+IF(NOT DEFINED PACKAGEDIR)
+       SET(PACKAGEDIR "${PREFIX}/share/packages")
+ENDIF(NOT DEFINED PACKAGEDIR)
 IF(NOT DEFINED DESKTOP_ICONDIR)
         SET(DESKTOP_ICONDIR "/usr/share/icons/default/small")
 ENDIF(NOT DEFINED DESKTOP_ICONDIR)
@@ -91,7 +91,7 @@ CONFIGURE_FILE(${PACKAGE_NAME}.xml.in ${PACKAGE_NAME}.xml)
 
 # Install
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
-INSTALL(FILES ${PACKAGE_NAME}.xml DESTINATION ${MANIFESTDIR})
+INSTALL(FILES ${PACKAGE_NAME}.xml DESTINATION ${PACKAGEDIR})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/${DESKTOP_ICON} DESTINATION ${DESKTOP_ICONDIR})
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/images/ DESTINATION ${IMAGEDIR})
 ADD_SUBDIRECTORY(data)

diff --git a/org.tizen.source-list-tv-ref.manifest b/org.tizen.source-list-tv-ref.manifest
deleted file mode 100644 (file)
index e2acfff..0000000
--- a/org.tizen.source-list-tv-ref.manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-<manifest>
-       <define>
-               <domain name="org.tizen.source-list-tv-ref" />
-       </define>
-       <request>
-               <domain name="org.tizen.source-list-tv-ref" />
-       </request>
-</manifest>

diff --git a/packaging/org.tizen.source-list-tv-ref.spec b/packaging/org.tizen.source-list-tv-ref.spec
index 8e53f42..8aeed29 100644 (file)
--- a/packaging/org.tizen.source-list-tv-ref.spec
+++ b/packaging/org.tizen.source-list-tv-ref.spec
@@ -20,12 +20,13 @@ BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(aul)
 
-%define _packagedir /usr/apps/%{name}
-%define _bindir %{_packagedir}/bin
-%define _imgdir %{_packagedir}/res/images
-%define _edjedir %{_packagedir}/res/edje
-%define _localedir %{_packagedir}/res/locale
-%define _manifestdir /usr/share/packages
+%define _appdir /usr/apps/%{name}
+%define _bindir %{_appdir}/bin
+%define _resdir %{_appdir}/res
+%define _imgdir %{_resdir}/images
+%define _edjedir %{_resdir}/edje
+%define _localedir %{_resdir}/locale
+%define _pkgdir %{_appdir}/data/packages
 %define _desktop_icondir /usr/share/icons/default/small
 
 %description
@@ -36,13 +37,13 @@ Description: source-list application
 
 %build
 cmake . \
-       -DCMAKE_INSTALL_PREFIX=%{_packagedir} \
+       -DCMAKE_INSTALL_PREFIX=%{_appdir} \
        -DPACKAGE_NAME=%{name} \
        -DBINDIR=%{_bindir} \
        -DIMAGEDIR=%{_imgdir} \
        -DEDJEDIR=%{_edjedir} \
        -DLOCALEDIR=%{_localedir} \
-       -DMANIFESTDIR=%{_manifestdir} \
+       -DPACKAGEDIR=%{_pkgdir} \
        -DVERSION=%{version}
 make %{?jobs:-j%jobs}
 
@@ -54,11 +55,10 @@ rm -rf %{buildroot}
 rm -rf %{buildroot}
 
 %files
-%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_bindir}/*
 %{_imgdir}/*.png
-%{_manifestdir}/%{name}.xml
+%{_pkgdir}/%{name}.xml
 %{_edjedir}/*
 %{_desktop_icondir}/%{name}.png