1. Revise rpm name from capi-security-privilege-manager to security-privilege-manager...

Change-Id: Ie212fe0ab401708483fd2512377591fb986418f0
Signed-off-by: Yunjin Lee <yunjin-.lee@samsung.com>

diff --git a/capi/CMakeLists.txt b/capi/CMakeLists.txt
index ca223da..0555d83 100644 (file)
--- a/capi/CMakeLists.txt
+++ b/capi/CMakeLists.txt
@@ -1,5 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-SET(fw_name "capi-security-privilege-manager")
+SET(fw_name "security-privilege-manager")
 
 PROJECT(${fw_name})
 
@@ -12,7 +12,7 @@ INCLUDE_DIRECTORIES(
     "${INC_DIR}"
     )
 
-SET(pc_requires "")
+SET(pc_requires "glib-2.0")
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(${fw_name} REQUIRED dlog pkgmgr-info glib-2.0)

diff --git a/capi/capi-security-privilege-manager.pc.in b/capi/security-privilege-manager.pc.in
similarity index 100%
rename from capi/capi-security-privilege-manager.pc.in
rename to capi/security-privilege-manager.pc.in

diff --git a/packaging/privilege-checker.spec b/packaging/privilege-checker.spec
index ec52fa3..a2c7f36 100644 (file)
--- a/packaging/privilege-checker.spec
+++ b/packaging/privilege-checker.spec
@@ -23,7 +23,7 @@ Requires: privilege-checker = %{version}-%{release}
 %description -n privilege-checker-devel
 Package for Privilege Management (DEV)
 
-%package -n capi-security-privilege-manager
+%package -n security-privilege-manager
 Summary:    Privilege Manager API
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(dlog)
@@ -33,14 +33,14 @@ BuildRequires:  pkgconfig(glib-2.0)
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
-%description -n capi-security-privilege-manager
+%description -n security-privilege-manager
 The Privilege Manager API provides functions to verify privilege information of packages to be installed.
 
-%package  -n capi-security-privilege-manager-devel
+%package  -n security-privilege-manager-devel
 Summary:  Privilege Manager API (Development)
-Requires: capi-security-privilege-manager
+Requires: security-privilege-manager
 
-%description -n capi-security-privilege-manager-devel
+%description -n security-privilege-manager-devel
 The Privilege Manager API provides functions to verify privilege information of packages to be installed.(DEV)
 
 %package  -n tc-privilege-checker
@@ -122,15 +122,15 @@ mkdir -p %{buildroot}%{_datadir}/privilege-manager
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%post -n capi-security-privilege-manager -p /sbin/ldconfig
-%postun -n capi-security-privilege-manager -p /sbin/ldconfig
+%post -n security-privilege-manager -p /sbin/ldconfig
+%postun -n security-privilege-manager -p /sbin/ldconfig
 
 %files -n privilege-checker
 %{_datadir}/license/privilege-checker
 %manifest packaging/privilege-checker.manifest
 
-%files -n capi-security-privilege-manager
-%{_libdir}/libcapi-security-privilege-manager.so*
+%files -n security-privilege-manager
+%{_libdir}/libsecurity-privilege-manager.so*
 %{_datadir}/locale/*
 #%if "%{?profile}" != "tv"
 %{_datadir}/privilege-manager/.core_privilege_info.db
@@ -138,11 +138,11 @@ mkdir -p %{buildroot}%{_datadir}/privilege-manager
 #%endif
 %{_datadir}/privilege-manager/.wrt_privilege_info.db
 %{_datadir}/privilege-manager/.wrt_privilege_mapping.db
-%manifest packaging/capi-security-privilege-manager.manifest
+%manifest packaging/security-privilege-manager.manifest
 
-%files -n capi-security-privilege-manager-devel
+%files -n security-privilege-manager-devel
 %{_includedir}/privilegemgr/*.h
-%{_libdir}/pkgconfig/capi-security-privilege-manager.pc
+%{_libdir}/pkgconfig/security-privilege-manager.pc
 
 %files -n tc-privilege-checker
 %{_bindir}/tc-privilege-db-manager

diff --git a/packaging/capi-security-privilege-manager.manifest b/packaging/security-privilege-manager.manifest
similarity index 100%
rename from packaging/capi-security-privilege-manager.manifest
rename to packaging/security-privilege-manager.manifest

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 8b49a5a..2252c50 100755 (executable)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -39,10 +39,10 @@ ADD_EXECUTABLE(${TC2_NAME} ${TC2_SRCS})
 ADD_EXECUTABLE(${TC3_NAME} ${TC3_SRCS})
 
 TARGET_LINK_LIBRARIES(${TC1_NAME}
-       "capi-security-privilege-manager"
+       "security-privilege-manager"
        )
-TARGET_LINK_LIBRARIES(${TC2_NAME} "capi-security-privilege-manager")
-TARGET_LINK_LIBRARIES(${TC3_NAME} "capi-security-privilege-manager")
+TARGET_LINK_LIBRARIES(${TC2_NAME} "security-privilege-manager")
+TARGET_LINK_LIBRARIES(${TC3_NAME} "security-privilege-manager")
 
 INSTALL(TARGETS ${TC1_NAME} DESTINATION /usr/bin)
 INSTALL(TARGETS ${TC2_NAME} DESTINATION /usr/bin)