Move policy to commons library

* bring back commons library and rpm
* move Policy and PkgInfo to commons

Change-Id: Ic5e5c1f4ffc642e09100ac3f7a3cb6dc2d7db0d4

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2211db4..76ba1e0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,11 +79,13 @@ SET(ASKUSER_PATH ${PROJECT_SOURCE_DIR}/src)
 
 
 SET(TARGET_ASKUSER_NOTIFICATION "askuser-notification")
+SET(TARGET_ASKUSER_COMMON "askuser-notification-common")
 SET(TARGET_ASKUSER_NOTIFICATION_LIB "askuser-notification-ipc")
 SET(TARGET_ASKUSER_NOTIFICATION_TEST "askuser-notification-test")
 SET(TARGET_PLUGIN_SERVICE "askuser-plugin-service")
 ADD_SUBDIRECTORY(src/plugin)
 ADD_SUBDIRECTORY(src/notification-daemon)
+ADD_SUBDIRECTORY(src/common)
 ADD_SUBDIRECTORY(src/common/protocol)
 
 IF (BUILD_WITH_SYSTEMD_DAEMON)

diff --git a/packaging/askuser-notification.spec b/packaging/askuser-notification.spec
index 6c0e6be..e7dd07e 100644 (file)
--- a/packaging/askuser-notification.spec
+++ b/packaging/askuser-notification.spec
@@ -10,6 +10,7 @@ Group:      Security/Access Control
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source1001:    default.manifest
+Source1002:    libaskuser-notification-common.manifest
 BuildRequires: cmake
 BuildRequires: libwayland-egl
 BuildRequires: gettext-tools
@@ -36,6 +37,12 @@ BuildRequires: edje-bin
 %description
 Daemon allowing user to grant or deny access for given application and privilege
 
+%package -n libaskuser-notification-common
+Summary:    Askuser common library
+
+%description -n libaskuser-notification-common
+Askuser common library with common functionalities
+
 %package libs
 Summary: Askuser notification protocol library
 
@@ -63,6 +70,7 @@ Tool for testing askuser-notification
 %prep
 %setup -q
 cp -a %{SOURCE1001} .
+cp -a %{SOURCE1002} .
 
 %build
 %if 0%{?sec_build_binary_debug_enable}
@@ -101,6 +109,10 @@ systemctl daemon-reload
 
 %postun
 
+%post -n libaskuser-notification-common -p /sbin/ldconfig
+
+%postun -n libaskuser-notification-common -p /sbin/ldconfig
+
 %post plugin
 systemctl restart cynara.service
 
@@ -122,6 +134,11 @@ systemctl restart cynara.service
 %endif
 %{_datadir}/askuser-notification/res/*
 
+%files -n libaskuser-notification-common
+%manifest libaskuser-notification-common.manifest
+%license LICENSE
+%{_libdir}/libaskuser-notification-common.so*
+
 %files libs
 %manifest default.manifest
 %license LICENSE

diff --git a/packaging/libaskuser-common.manifest b/packaging/libaskuser-notification-common.manifest
similarity index 100%
rename from packaging/libaskuser-common.manifest
rename to packaging/libaskuser-notification-common.manifest

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index bce110e..6e3e8e6 100644 (file)
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -18,11 +18,8 @@
 
 PKG_CHECK_MODULES(COMMON_DEP
     REQUIRED
-    cynara-plugin
-    cynara-agent
-    glib-2.0
-    libsystemd
-    security-privilege-manager
+    security-manager
+    pkgmgr-info
     )
 
 SET(ASKUSER_COMMON_VERSION_MAJOR 0)
@@ -40,15 +37,10 @@ INCLUDE_DIRECTORIES(
 
 SET(COMMON_SOURCES
     ${COMMON_PATH}/log/alog.cpp
-    ${COMMON_PATH}/policy/PrivilegeInfo.cpp
-    ${COMMON_PATH}/socket/Socket.cpp
-    ${COMMON_PATH}/socket/Poll.cpp
-    ${COMMON_PATH}/translator/Translator.cpp
-    ${COMMON_PATH}/translator/GuiTranslator.cpp
+    ${COMMON_PATH}/policy/Policy.cpp
     ${COMMON_PATH}/types/AgentErrorMsg.cpp
     ${COMMON_PATH}/util/SafeFunction.cpp
     ${COMMON_PATH}/config/Limits.cpp
-    ${COMMON_PATH}/config/Path.cpp
     )
 
 ADD_DEFINITIONS("-fvisibility=default")

diff --git a/src/notification-daemon/policy/PkgInfo.h b/src/common/policy/PkgInfo.h
similarity index 100%
rename from src/notification-daemon/policy/PkgInfo.h
rename to src/common/policy/PkgInfo.h

diff --git a/src/notification-daemon/policy/Policy.cpp b/src/common/policy/Policy.cpp
similarity index 100%
rename from src/notification-daemon/policy/Policy.cpp
rename to src/common/policy/Policy.cpp

diff --git a/src/notification-daemon/policy/Policy.h b/src/common/policy/Policy.h
similarity index 100%
rename from src/notification-daemon/policy/Policy.h
rename to src/common/policy/Policy.h

diff --git a/src/notification-daemon/CMakeLists.txt b/src/notification-daemon/CMakeLists.txt
index 80e724c..db96420 100644 (file)
--- a/src/notification-daemon/CMakeLists.txt
+++ b/src/notification-daemon/CMakeLists.txt
@@ -10,12 +10,10 @@ PKG_CHECK_MODULES(ASKUSER_NOTIFICATION_DEP
     libsystemd
     notification
     vconf
-    pkgmgr-info
     glib-2.0
     capi-ui-efl-util
     capi-system-info
     security-privilege-manager
-    security-manager
 )
 
 INCLUDE_DIRECTORIES(SYSTEM
@@ -33,10 +31,8 @@ SET(ASKUSER_NOTIFICATION_SOURCES
     ${NOTIF_PATH}/Logic.cpp
     ${NOTIF_PATH}/PolicyUpdater.cpp
     ${NOTIF_PATH}/ServerCallbacks.cpp
-    ${NOTIF_PATH}/policy/Policy.cpp
     ${NOTIF_PATH}/policy/PrivilegeInfo.cpp
     ${NOTIF_PATH}/ui/Po.cpp
-    ${ASKUSER_PATH}/common/log/alog.cpp
     ${NOTIF_PATH}/ui/Popupper.cpp
    )