From: Yunjin Lee Date: Fri, 21 Oct 2016 03:00:33 +0000 (+0900) Subject: Remove rpmlint error and warning and add build type NO_DB X-Git-Tag: submit/tizen/20161108.043312~3^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=88b78400cbe5a8c4abc5c3f2b92ca765b45a2ae3;p=platform%2Fcore%2Fsecurity%2Fprivilege-checker.git Remove rpmlint error and warning and add build type NO_DB - Remove rpmlint error and warning caused by package description and lang files - Add build_type NO_DB to reduce build time for test without DB changes Change-Id: Ia2b64035dad5346ec16458d67721f2820d94bda5 Signed-off-by: Yunjin Lee --- diff --git a/capi/CMakeLists.txt b/capi/CMakeLists.txt index 4b583b4..2ad95d3 100644 --- a/capi/CMakeLists.txt +++ b/capi/CMakeLists.txt @@ -133,4 +133,6 @@ ADD_CUSTOM_TARGET(privilege-string ALL DEPENDS ${mo_files}) INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/cmake_build_tmp/output/target/generic/root/usr/share/locale DESTINATION ${DATADIR}) -ADD_SUBDIRECTORY(res/dbspace) +IF (NOT("${CMAKE_BUILD_TYPE}" STREQUAL "NO_DB")) + ADD_SUBDIRECTORY(res/dbspace) +ENDIF() diff --git a/packaging/privilege-checker.spec b/packaging/privilege-checker.spec index 257e216..15bb785 100644 --- a/packaging/privilege-checker.spec +++ b/packaging/privilege-checker.spec @@ -10,11 +10,15 @@ BuildRequires: pkgconfig(dlog) Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig +%if !%{defined build_type} +%define build_type RELEASE +%endif + %description Pakcage for Privilege Management %package -n privilege-checker-devel -summary: privilege-checker-devel +summary: Package for Privilege Management (DEV) Group: Development/Libraries Requires: privilege-checker = %{version}-%{release} @@ -43,10 +47,10 @@ Requires: security-privilege-manager The Privilege Manager API provides functions to verify privilege information of packages to be installed.(DEV) %package -n tc-privilege-checker -Summary: tc-privilege-checker +Summary: Internal TC for privilege-checker %description -n tc-privilege-checker -Testsuit for Privilege Manager APIs +Internal TC for privilege-checker APIs %package -n privilege-verifier Summary: Privilege Verification Utility @@ -78,6 +82,9 @@ The Privilege Verifier Utility provides functions to verify privilege informatio export CFLAGS="$CFLAGS -DTIZEN_ENGINEER_MODE " export CXXFLAGS="$CXXFLAGS -DTIZEN_ENGINEER_MODE " +%if %{?build_type} == "DEBUG" +export CFLAGS="$CFLAGS -Wp,-U_FORTIFY_SOURCE" +%endif export FFLAGS="$FFLAGS -DTIZEN_ENGINEER_MODE" echo cmake . -DPREFIX=%{_prefix} \ @@ -108,9 +115,7 @@ mkdir -p %{buildroot}%{_datadir}/license cp LICENSE.APLv2 %{buildroot}%{_datadir}/license/privilege-checker mkdir -p %{buildroot}%{_datadir}/privilege-manager %make_install - -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%find_lang privilege %post -n security-privilege-manager -p /sbin/ldconfig %postun -n security-privilege-manager -p /sbin/ldconfig @@ -119,17 +124,16 @@ mkdir -p %{buildroot}%{_datadir}/privilege-manager %{_datadir}/license/privilege-checker %manifest packaging/privilege-checker.manifest -%files -n security-privilege-manager +%files -n security-privilege-manager -f privilege.lang %{_libdir}/libsecurity-privilege-manager.so* -%{_datadir}/locale/* -#%if "%{?profile}" != "tv" +%if "%{?build_type}" != "NO_DB" %{_datadir}/privilege-manager/.core_privilege_info.db %{_datadir}/privilege-manager/.core_privilege_mapping.db -#%endif %{_datadir}/privilege-manager/.wrt_privilege_info.db %{_datadir}/privilege-manager/.wrt_privilege_mapping.db %config(noreplace) %{_datadir}/privilege-manager/.policy.db %config(noreplace) %{_datadir}/privilege-manager/.policy.db-journal +%endif %manifest packaging/security-privilege-manager.manifest %files -n security-privilege-manager-devel