Merge branch 'tizen_2.2' into tizen

Conflicts:
	CMakeLists.txt
	packaging/pkgmgr-info.spec
	parser/pkgmgr_parser.c
	parser_path.conf.in

diff --cc CMakeLists.txt
index 5cf825e0f29346593b7286adee7c364e20867efc,17404baa39e5cbe3425b2454b9416e8fb50849c9..0fdc94415bdde587b43dd7079bbd235b52180ada
mode 100644,100755..100644
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -58,4 -62,6 +63,6 @@@ configure_file(category_parser_list.txt
  INSTALL(TARGETS pkgmgr-info DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgmgr-info.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/pkgmgr-info.h DESTINATION include)
 -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/parser_path.conf DESTINATION ${PREFIX}/etc/package-manager/)
 -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mdparser_list.txt DESTINATION ${PREFIX}/etc/package-manager/parserlib/metadata)
 -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/category_parser_list.txt DESTINATION ${PREFIX}/etc/package-manager/parserlib/category)
 +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/parser_path.conf DESTINATION ${SYSCONFDIR}/package-manager/)
++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mdparser_list.txt DESTINATION ${SYSCONFDIR}/package-manager/parserlib/metadata)
++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/category_parser_list.txt DESTINATION ${SYSCONFDIR}/package-manager/parserlib/category)

diff --cc packaging/pkgmgr-info.spec
index e22bb0a573fb86ce82d26dfbb725da34677824e9,f46a038a239c473447bbf7135d1b94a098377c47..af4d993c509dbcc028f048d1b5abc11ae8340fca
--- 1/packaging/pkgmgr-info.spec
--- 2/packaging/pkgmgr-info.spec
+++ b/packaging/pkgmgr-info.spec
@@@ -11,7 -10,7 +11,7 @@@ BuildRequires:        pkgconfig(dlog
  BuildRequires:        pkgconfig(vconf)
  BuildRequires:        pkgconfig(sqlite3)
  BuildRequires:        pkgconfig(db-util)
--BuildRequires:pkgconfig(libxml-2.0)
++BuildRequires:  pkgconfig(libxml-2.0)
  
  %description
  Packager Manager infomation api for packaging
@@@ -73,16 -77,17 +73,18 @@@ touch %{buildroot}/opt/usr/apps/tmp/pkg
  %{_libdir}/libpkgmgr-info.so
  
  %files parser
 -%manifest pkgmgr-parser.manifest
 +%manifest %{name}.manifest
  %defattr(-,root,root,-)
  %{_libdir}/libpkgmgr_parser.so.*
 -%{_prefix}/etc/package-manager/preload/preload_list.txt
 -%{_prefix}/etc/package-manager/preload/manifest.xsd
 -%{_prefix}/etc/package-manager/preload/xml.xsd
 -%{_prefix}/etc/package-manager/parser_path.conf
 -%{_prefix}/etc/package-manager/parserlib/metadata/mdparser_list.txt
 -%{_prefix}/etc/package-manager/parserlib/category/category_parser_list.txt
 +%{_sysconfdir}/package-manager/preload/preload_list.txt
 +%{_sysconfdir}/package-manager/preload/manifest.xsd
 +%{_sysconfdir}/package-manager/preload/xml.xsd
 +%{_sysconfdir}/package-manager/parser_path.conf
++%{_sysconfdir}/package-manager/parserlib/metadata/mdparser_list.txt
++%{_sysconfdir}/package-manager/parserlib/category/category_parser_list.txt
  
  %files parser-devel
 +%manifest %{name}.manifest
  %defattr(-,root,root,-)
  %{_includedir}/pkgmgr/pkgmgr_parser.h
  %{_includedir}/pkgmgr/pkgmgr_parser_db.h

diff --cc parser/pkgmgr_parser.c
index aefec70d0f087fc8062c5389f57e370781ce1771,7f875d0773eebe5cf4194b2f4544e60580559486..256b2f4e855c1a2a892c65d84a1eecbcc598155e
--- 1/parser/pkgmgr_parser.c
--- 2/parser/pkgmgr_parser.c
+++ b/parser/pkgmgr_parser.c
@@@ -3728,8 -4459,7 +4459,7 @@@ END
        return ret;
  }
  
- #define MANIFEST_RO_PREFIX "/usr/share/packages/"
 -#define PRELOAD_PACKAGE_LIST "/usr/etc/package-manager/preload/preload_list.txt"
 +#define PRELOAD_PACKAGE_LIST SYSCONFDIR "/package-manager/preload/preload_list.txt"
  static int __add_preload_info(manifest_x * mfx, const char *manifest)
  {
        FILE *fp = NULL;

diff --cc parser/pkgmgr_parser.h
Simple merge

diff --cc parser_path.conf.in
index f2eeb2aa3e0ef157a5bc4d516da9f2cf5d5ae886,a54cc0a4d5148b4b158a29ca6899067ffbb7e709..34453a9d3bd8a872c8fb22c4f67488971c3fd45d
mode 100644,100755..100644
--- 1/parser_path.conf.in
--- 2/parser_path.conf.in
+++ b/parser_path.conf.in
@@@ -1,4 -1,6 +1,6 @@@
  # usage
  # parserlib:directory_path
  
 -parserlib:/usr/etc/package-manager/parserlib/
 -mdparser:/usr/etc/package-manager/parserlib/metadata/
 -categoryparser:/usr/etc/package-manager/parserlib/category/
 +parserlib:@SYSCONFDIR@/package-manager/parserlib/
++mdparser:@SYSCONFDIR@/package-manager/parserlib/metadata/
++categoryparser:@SYSCONFDIR@/package-manager/parserlib/category/