Fix typo on spec file and CMakeLists 00/86800/3
authorsangwan.kwon <sangwan.kwon@samsung.com>
Mon, 5 Sep 2016 01:20:34 +0000 (10:20 +0900)
committersangwan kwon <sangwan.kwon@samsung.com>
Mon, 5 Sep 2016 02:46:51 +0000 (19:46 -0700)
* Fix SMACK_DOMAIN_NAME macro.
* FIX CERT_SVC_DB_PATH macro.
* Restore CERT_SVC_DB_PATH DAC.

Change-Id: I9a27de74c19b814e415c4a602a8fb7b36219becd
Signed-off-by: sangwan.kwon <sangwan.kwon@samsung.com>
CMakeLists.txt
packaging/cert-svc.spec

index 7cae406..88d6e30 100644 (file)
@@ -29,7 +29,7 @@ SET(TARGET_CERT_SERVER "cert-server")
 
 ADD_DEFINITIONS("-DSIGNATURE_SCHEMA_PATH=\"${CERT_SVC_RO_PATH}/schema.xsd\"")
 
-ADD_DEFINITIONS("-DCERTSVC_SYSTEM_STORE_DB=\"${CERT_SVC_DB}/certs-meta.db\"")
+ADD_DEFINITIONS("-DCERTSVC_SYSTEM_STORE_DB=\"${CERT_SVC_DB_PATH}/certs-meta.db\"")
 ADD_DEFINITIONS("-DCERTSVC_PKCS12_STORAGE_DIR=\"${CERT_SVC_PKCS12}/\"")
 
 ADD_DEFINITIONS("-DTZ_SYS_CA_CERTS=\"${TZ_SYS_CA_CERTS}\"")
index ee90b4f..62b2b34 100644 (file)
@@ -35,7 +35,7 @@ BuildRequires: pkgconfig(cert-checker)
 
 %global USER_NAME security_fw
 %global GROUP_NAME security_fw
-%global SMACK_DONMAIN_NAME System
+%global SMACK_DOMAIN_NAME System
 
 %global TZ_SYS_BIN              %{?TZ_SYS_BIN:%TZ_SYS_BIN}%{!?TZ_SYS_BIN:%_bindir}
 %global TZ_SYS_ETC              %{?TZ_SYS_ETC:%TZ_SYS_ETC}%{!?TZ_SYS_ETC:/opt/etc}
@@ -174,6 +174,7 @@ fi
 %TZ_SYS_BIN/cert-server
 %dir %attr(-, %{USER_NAME}, %{GROUP_NAME}) %CERT_SVC_PATH
 %dir %attr(-, %{USER_NAME}, %{GROUP_NAME}) %CERT_SVC_PKCS12
+%dir %attr(-, %{USER_NAME}, %{GROUP_NAME}) %CERT_SVC_DB_PATH
 %attr(-, %{USER_NAME}, %{GROUP_NAME}) %CERT_SVC_CA_BUNDLE
 %attr(-, %{USER_NAME}, %{GROUP_NAME}) %CERT_SVC_DB_PATH/certs-meta.db
 %attr(-, %{USER_NAME}, %{GROUP_NAME}) %CERT_SVC_DB_PATH/certs-meta.db-journal