Add creds configuration 36/27236/12
authorRadoslaw Bartosiak <r.bartosiak@samsung.com>
Mon, 8 Sep 2014 11:45:22 +0000 (13:45 +0200)
committerRadoslaw Bartosiak <r.bartosiak@samsung.com>
Thu, 23 Oct 2014 17:18:24 +0000 (19:18 +0200)
Configuration is used by cynara_creds_get_[client|user]_method to
provide default values of [client|user] feature used in
cynara-creds.

Change-Id: I9a8b8e0bb009817414b9755523a60edb3d0386d0
Signed-off-by: Radoslaw Bartosiak <r.bartosiak@samsung.com>
conf/creds.conf [new file with mode: 0644]
packaging/cynara.spec

diff --git a/conf/creds.conf b/conf/creds.conf
new file mode 100644 (file)
index 0000000..10bce6b
--- /dev/null
@@ -0,0 +1,2 @@
+client_default=smack
+user_default=uid
index 4d067c3..ffcccfb 100644 (file)
@@ -31,7 +31,8 @@ BuildRequires: pkgconfig(libsystemd-journal)
 %global group_name %{name}
 
 %global state_path %{_localstatedir}/%{name}/
-%global tests_dir %{_datarootdir}/%{name}/tests
+%global tests_dir %{_datarootdir}/%{name}/tests/
+%global conf_path %{_sysconfdir}/%{name}/
 
 %if !%{defined build_type}
 %define build_type RELEASE
@@ -218,7 +219,6 @@ BuildRequires: pkgconfig(gmock)
 Cynara tests
 
 #######################################################
-
 %package -n cynara-devel
 Summary:    Cynara service (devel)
 Requires:   cynara = %{version}-%{release}
@@ -252,7 +252,8 @@ export CXXFLAGS="$CXXFLAGS -Wp,-U_FORTIFY_SOURCE"
 %endif
 
 export CXXFLAGS="$CXXFLAGS -DCYNARA_STATE_PATH=\\\"%{state_path}\\\" \
-                           -DCYNARA_TESTS_DIR=\\\"%{tests_dir}\\\""
+                           -DCYNARA_TESTS_DIR=\\\"%{tests_dir}\\\" \
+                           -DCYNARA_CONFIGURATION_DIR=\\\"%{conf_path}\\\""
 export LDFLAGS+="-Wl,--rpath=%{_libdir}"
 
 %cmake . \
@@ -262,10 +263,12 @@ export LDFLAGS+="-Wl,--rpath=%{_libdir}"
 make %{?jobs:-j%jobs}
 
 %install
-
 rm -rf %{buildroot}
 %make_install
 
+mkdir -p %{buildroot}/%{conf_path}
+cp ./conf/creds.conf %{buildroot}/%{conf_path}/creds.conf
+
 mkdir -p %{buildroot}/usr/lib/systemd/system/sockets.target.wants
 mkdir -p %{buildroot}/%{state_path}
 mkdir -p %{buildroot}/%{tests_dir}
@@ -476,6 +479,7 @@ fi
 %manifest libcynara-creds-commons.manifest
 %license LICENSE
 %{_libdir}/libcynara-creds-commons.so.*
+%{conf_path}creds.conf
 
 %files -n libcynara-creds-commons-devel
 %{_includedir}/cynara/cynara-creds-commons.h