X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fkey-manager.spec;h=ba3b79d3b324e4ea610e7a0ef5fd4c1f60d68187;hb=refs%2Ftags%2Faccepted%2Ftizen%2Ftv%2F20150911.091520;hp=7855988be344d91b4b4c1f9beb06dcb46f15fefa;hpb=82f657827c1c162b72e454784daf92103ed315a4;p=platform%2Fcore%2Fsecurity%2Fkey-manager.git

diff --git a/packaging/key-manager.spec b/packaging/key-manager.spec
index 7855988..ba3b79d 100644
--- a/packaging/key-manager.spec
+++ b/packaging/key-manager.spec
@@ -1,6 +1,6 @@
 Name:       key-manager
 Summary:    Central Key Manager and utilities
-Version:    0.1.14
+Version:    0.1.16
 Release:    1
 Group:      System/Security
 License:    Apache-2.0
@@ -19,6 +19,10 @@ BuildRequires: pkgconfig(libsystemd-daemon)
 BuildRequires: pkgconfig(vconf)
 BuildRequires: pkgconfig(libsystemd-journal)
 BuildRequires: pkgconfig(libxml-2.0)
+BuildRequires: pkgconfig(capi-system-info)
+BuildRequires: pkgconfig(security-manager)
+BuildRequires: pkgconfig(cynara-client-async)
+BuildRequires: pkgconfig(cynara-creds-socket)
 BuildRequires: boost-devel
 Requires: libkey-manager-common = %{version}-%{release}
 %{?systemd_requires}
@@ -101,6 +105,9 @@ cp -a %{SOURCE1002} .
 cp -a %{SOURCE1003} .
 cp -a %{SOURCE1004} .
 
+# optional password disabled temporary for milestone release
+%define ckm_optional_password_enable 0
+
 %build
 %if 0%{?sec_build_binary_debug_enable}
     export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE"
@@ -117,8 +124,12 @@ export LDFLAGS+="-Wl,--rpath=%{_libdir},-Bsymbolic-functions "
 %if "%{sec_product_feature_security_mdfpp_enable}" == "1"
         -DSECURITY_MDFPP_STATE_ENABLE=1 \
 %endif
+%if 0%{?ckm_optional_password_enable}
+        -DOPTIONAL_PASSWORD_ENABLE=1 \
+%endif
         -DSYSTEMD_UNIT_DIR=%{_unitdir} \
-        -DSYSTEMD_ENV_FILE="/etc/sysconfig/central-key-manager"
+        -DSYSTEMD_ENV_FILE="/etc/sysconfig/central-key-manager" \
+        -DMOCKUP_SM=%{?mockup_sm:%mockup_sm}%{!?mockup_sm:OFF}
 
 make %{?jobs:-j%jobs}
 
@@ -128,9 +139,11 @@ mkdir -p %{buildroot}/usr/share/license
 cp LICENSE %{buildroot}/usr/share/license/%{name}
 cp LICENSE %{buildroot}/usr/share/license/libkey-manager-client
 cp LICENSE %{buildroot}/usr/share/license/libkey-manager-control-client
+mkdir -p %{buildroot}/opt/data/ckm/initial_values
 mkdir -p %{buildroot}/etc/security/
 mkdir -p %{buildroot}/usr/share/ckm/scripts
 cp data/scripts/*.sql %{buildroot}/usr/share/ckm/scripts
+cp doc/initial_values.xsd %{buildroot}/usr/share/ckm
 mkdir -p %{buildroot}/usr/share/ckm-db-test
 cp tests/testme_ver1.db %{buildroot}/usr/share/ckm-db-test/
 cp tests/testme_ver2.db %{buildroot}/usr/share/ckm-db-test/
@@ -151,6 +164,7 @@ ln -s ../central-key-manager-listener.service %{buildroot}%{_unitdir}/multi-user
 ln -s ../central-key-manager-api-control.socket %{buildroot}%{_unitdir}/sockets.target.wants/central-key-manager-api-control.socket
 ln -s ../central-key-manager-api-storage.socket %{buildroot}%{_unitdir}/sockets.target.wants/central-key-manager-api-storage.socket
 ln -s ../central-key-manager-api-ocsp.socket %{buildroot}%{_unitdir}/sockets.target.wants/central-key-manager-api-ocsp.socket
+ln -s ../central-key-manager-api-encryption.socket %{buildroot}%{_unitdir}/sockets.target.wants/central-key-manager-api-encryption.socket
 
 %clean
 rm -rf %{buildroot}
@@ -220,8 +234,13 @@ fi
 %{_unitdir}/central-key-manager-api-storage.socket
 %{_unitdir}/sockets.target.wants/central-key-manager-api-ocsp.socket
 %{_unitdir}/central-key-manager-api-ocsp.socket
+%{_unitdir}/sockets.target.wants/central-key-manager-api-encryption.socket
+%{_unitdir}/central-key-manager-api-encryption.socket
 %{_datadir}/license/%{name}
 %{_datadir}/ckm/scripts/*.sql
+%{_datadir}/
+%{_datadir}/ckm/initial_values.xsd
+/opt/data/ckm/initial_values/
 %attr(444, root, root) %{_datadir}/ckm/scripts/*.sql
 /etc/opt/upgrade/230.key-manager-migrate-dkek.patch.sh
 /etc/gumd/userdel.d/10_key-manager.post
@@ -278,6 +297,7 @@ fi
 %{_datadir}/ckm-db-test/XML_1_wrong.xsd
 %{_datadir}/ckm-db-test/XML_2_structure.xml
 %{_bindir}/ckm_so_loader
+%{_bindir}/ckm_db_tool
 
 %files -n key-manager-pam-plugin
 %defattr(-,root,root,-)