Merge tizen branch

Signed-off-by: hb.min <hb.min@samsung.com>

diff --cc client/CMakeLists.txt
Simple merge

diff --cc packaging/privacy-manager.spec
index af627d3,4817c34..7da56ef
--- 1/packaging/privacy-manager.spec
--- 2/packaging/privacy-manager.spec
+++ b/packaging/privacy-manager.spec
@@@ -1,21 -1,12 +1,20 @@@
  Name:    privacy-manager-server
  Summary: Privacy Management
- Version: 0.0.3
- Release: 1
+ Version: 0.0.4
+ Release: 0
 -Group:   System/Libraries
 -License: SAMSUNG
 +Group:   Security/Libraries
 +License: Apache-2.0
  Source0: %{name}-%{version}.tar.gz
  Source1: privacy-manager-server.service
- Source1007: tizenprv00.privacy-popup.manifest
 +Source1001: privacy-manager-server.manifest
 +Source1002: privacy-manager-server-devel.manifest
 +Source1003: privacy-manager-client.manifest
 +Source1004: privacy-manager-client-devel.manifest
 +Source1005: capi-security-privacy-manager.manifest
 +Source1006: capi-security-privacy-manager-devel.manifest
  BuildRequires: cmake
 +BuildRequires:  pkgconfig(capi-base-common)
 +BuildRequires: pkgconfig(libxml-2.0)
  BuildRequires: pkgconfig(dlog)
  BuildRequires: pkgconfig(glib-2.0)
  BuildRequires: pkgconfig(sqlite3)
@@@ -96,16 -75,16 +88,15 @@@ The Privacy Manager API provides functi
  %setup -q
  
  %build
- cp %{SOURCE1007} .
 +cp %{SOURCE1001} .
 +cp %{SOURCE1002} .
 +cp %{SOURCE1003} .
 +cp %{SOURCE1004} .
 +cp %{SOURCE1005} .
 +cp %{SOURCE1006} .
  #%{!?build_type:%define build_type "Release"}
  
 -echo cmake . -DPREFIX=%{_prefix} \
 -        -DEXEC_PREFIX=%{_exec_prefix} \
 -        -DLIBDIR=%{_libdir} \
 -        -DINCLUDEDIR=%{_includedir} \
 -        -DCMAKE_BUILD_TYPE=%{build_type} \
 -        -DVERSION=%{version} \
 -        -DFILTER_LISTED_PKG=ON
 -cmake . -DPREFIX=%{_prefix} \
 +%cmake . -DPREFIX=%{_prefix} \
          -DEXEC_PREFIX=%{_exec_prefix} \
          -DLIBDIR=%{_libdir} \
          -DINCLUDEDIR=%{_includedir} \
@@@ -120,13 -103,23 +115,17 @@@ mkdir -p %{buildroot}/usr/bi
  cp res/usr/bin/* %{buildroot}/usr/bin/
  mkdir -p %{buildroot}/opt/dbspace
  cp res/opt/dbspace/.privacylist.db /%{buildroot}/opt/dbspace/
+ mkdir -p %{buildroot}/usr/share/privacy-manager/
+ cp res/usr/share/privacy-manager/privacy-filter-list.ini %{buildroot}/usr/share/privacy-manager/
+ #mkdir -p %{buildroot}/etc/rc.d/init.d
+ #cp res/etc/rc.d/init.d/* %{buildroot}/etc/rc.d/init.d/
  
  %make_install
 -#mkdir -p %{buildroot}/etc/rc.d/rc3.d
 -#mkdir -p %{buildroot}/etc/rc.d/rc5.d
 -#ln -sf /etc/rc.d/init.d/privacy-manager-server.sh %{buildroot}/etc/rc.d/rc3.d/S10privacy-manager-server.sh
 -#ln -sf /etc/rc.d/init.d/privacy-manager-server.sh %{buildroot}/etc/rc.d/rc5.d/S10privacy-manager-server.sh
  
- mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
- install -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/privacy-manager-server.service
- ln -sf %{_unitdir}/privacy-manager-server.service %{buildroot}%{_unitdir}/multi-user.target.wants/privacy-manager-server.service
+ mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
+ #install -m 0644 %{SOURCE1} %{buildroot}%{_libdir}/systemd/system/privacy-manager-server.service
+ #ln -sf /usr/lib/systemd/system/privacy-manager-server.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/privacy-manager-server.service
  
 -%clean
 -rm -rf %{buildroot}
  
  %post -n privacy-manager-server
  /sbin/ldconfig
@@@ -138,49 -131,46 +137,52 @@@ the
        /usr/bin/privacy_manager_create_clean_db.sh
  fi
  
 -%postun
 -/sbin/ldconfig
 +%postun -p /sbin/ldconfig
 +
 +%post -n privacy-manager-client -p /sbin/ldconfig
 +
 +%postun -n privacy-manager-client -p /sbin/ldconfig
 +
 +%post -n capi-security-privacy-manager -p /sbin/ldconfig
 +
 +%postun -n capi-security-privacy-manager -p /sbin/ldconfig
  
  %files -n privacy-manager-server
- %license  LICENSE.APLv2
++#%license  LICENSE.APLv2
  %defattr(-,root,root,-)
 -%manifest packaging/privacy-manager-server.manifest
 -%{_libdir}/libprivacy-manager-server.so*
 +%manifest privacy-manager-server.manifest
 +%{_bindir}/*
 +%{_prefix}/lib/systemd/*
+ /usr/share/license/privacy-manager-server
  /opt/dbspace/.privacylist.db
 -/usr/bin/*
  
  %files -n privacy-manager-server-devel
 -%{_includedir}/privacy_manager/privacy_manager_daemon.h
++%{_includedir}/privacy_manager/server/privacy_manager_daemon.h
  %{_libdir}/pkgconfig/privacy-manager-server.pc
  
  %files -n privacy-manager-client
- %license  LICENSE.APLv2
++#%license  LICENSE.APLv2
  %defattr(-,root,root,-)
 -%manifest packaging/privacy-manager-client.manifest
 +%manifest privacy-manager-client.manifest
  %{_libdir}/libprivacy-manager-client.so*
 -/usr/etc/package-manager/parserlib/libprivileges.so
+ /usr/share/license/privacy-manager-client
+ /usr/share/privacy-manager/privacy-filter-list.ini
 +/etc/package-manager/parserlib/libprivileges.so
  
  %files -n privacy-manager-client-devel
 +%manifest privacy-manager-client-devel.manifest
  %defattr(-,root,root,-)
 +%{_includedir}/*
  %{_libdir}/pkgconfig/privacy-manager-client.pc
  
 -%{_includedir}/privacy_manager/PrivacyManagerClient.h
 -%{_includedir}/privacy_manager/PrivacyChecker.h
 -%{_includedir}/privacy_manager/privacy_info_client.h
 -%{_includedir}/privacy_manager/privacy_manager_client.h
 -%{_includedir}/privacy_manager/privacy_checker_client.h
 -%{_includedir}/privacy_manager/privacy_manager_client_types.h
 -
  
- 
  %files -n capi-security-privacy-manager
- %license  LICENSE.APLv2
++#%license  LICENSE.APLv2
  %{_libdir}/libcapi-security-privacy-manager.so.*
 -%manifest packaging/capi-security-privacy-manager.manifest
 +%manifest capi-security-privacy-manager.manifest
  
  %files -n capi-security-privacy-manager-devel
 +%manifest capi-security-privacy-manager-devel.manifest
  %{_includedir}/privacymgr/*.h
  %{_libdir}/libcapi-security-privacy-manager.so
  %{_libdir}/pkgconfig/capi-security-privacy-manager.pc

diff --cc server/CMakeLists.txt
index b9246a8,0e07e98..259ddbf
--- 1/server/CMakeLists.txt
--- 2/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@@ -65,15 -72,20 +71,20 @@@ SET(PRIVACY_MANAGER_SERVER_CFLAGS  " ${
  #SET(PRIVACY_MANAGER_SERVER_LIBADD " ")
  
  ADD_DEFINITIONS("-DLOG_TAG=\"PRIVACY-MANAGER-SERVER\"")
- ADD_EXECUTABLE(privacy-manager-server ${PRIVACY_MANAGER_SERVER_SOURCES})
+ ADD_LIBRARY(privacy-manager-server SHARED ${PRIVACY_MANAGER_SERVER_SOURCES})
  TARGET_LINK_LIBRARIES(privacy-manager-server ${pkgs_LDFLAGS} ${pkgs_LIBRARIES})
  SET_TARGET_PROPERTIES(privacy-manager-server PROPERTIES COMPILE_FLAGS "${PRIVACY_MANAGER_SERVER_CFLAGS}")
- #SET_TARGET_PROPERTIES(privacy-manager-client PROPERTIES SOVERSION ${API_VERSION})
- #SET_TARGET_PROPERTIES(privacy-manager-client PROPERTIES VERSION ${VERSION})
+ SET_TARGET_PROPERTIES(privacy-manager-server PROPERTIES SOVERSION ${API_VERSION})
+ SET_TARGET_PROPERTIES(privacy-manager-server PROPERTIES VERSION ${VERSION})
  ###################################################################################################
  
+ SET(PC_NAME privacy-manager-server)
+ SET(PC_DESCRIPTION "Privacy Manager Server API")
+ SET(PC_LDFLAGS -lprivacy-manager-server)
+ SET(PC_CFLAGS -I\${includedir}/privacy_manager)
+ 
  CONFIGURE_FILE(../privacy-manager-server.pc.in privacy-manager-server.pc @ONLY)
  
 -INSTALL(TARGETS privacy-manager-server DESTINATION ../lib COMPONENT RuntimeLibraries)
 -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/privacy-manager-server.pc DESTINATION ../lib/pkgconfig)
 -INSTALL(FILES ${PRIVACY_MANAGER_SERVER_HEADERS} DESTINATION ../include/privacy_manager)
 +INSTALL(TARGETS privacy-manager-server DESTINATION bin COMPONENT RuntimeLibraries)
 +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/privacy-manager-server.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 +INSTALL(FILES ${PRIVACY_MANAGER_SERVER_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/privacy_manager/server)