summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjin-gyu.kim <jin-gyu.kim@samsung.com>2018-01-17 16:11:36 +0900
committerjin-gyu.kim <jin-gyu.kim@samsung.com>2018-01-17 16:28:51 +0900
commitd684a464084aef706434493c47ced86adc595a40 (patch)
tree93f6ab11671afe953336144864d3856488246c92
parent0c28ae74e68c4bff1920a8f425b6fbf83b482672 (diff)
downloadsecurity-manager-d684a464084aef706434493c47ced86adc595a40.tar.gz
security-manager-d684a464084aef706434493c47ced86adc595a40.tar.bz2
security-manager-d684a464084aef706434493c47ced86adc595a40.zip
Change license-manager package name.
There could be naming conflicts with another package. Therefore, change as security-license-manager. Also, add explicit dependency with this name to install properly. Change-Id: Iee0853b3191cd19361fc5b0c9b95509b0addad01
-rw-r--r--packaging/security-manager.spec13
1 files changed, 7 insertions, 6 deletions
diff --git a/packaging/security-manager.spec b/packaging/security-manager.spec
index 057504fa..0b325af1 100644
--- a/packaging/security-manager.spec
+++ b/packaging/security-manager.spec
@@ -10,6 +10,7 @@ Source3: libsecurity-manager-client.manifest
Source4: libnss-security-manager.manifest
Source5: security-manager-tests.manifest
Requires: security-manager-policy
+Requires: security-license-manager
#Requires: nether
%if "%{build_type}" == "VALGRIND"
Requires: valgrind
@@ -89,12 +90,12 @@ Requires: boost-test
%description -n security-manager-tests
Internal test for security manager implementation.
-%package -n license-manager
+%package -n security-license-manager
Summary: Plugins for cynara service and client
Group: Security/Development
Requires: cynara
-%description -n license-manager
+%description -n security-license-manager
Package with plugins for cynara.
%prep
@@ -195,7 +196,7 @@ fi
%postun -n libnss-security-manager -p /sbin/ldconfig
-%post -n license-manager
+%post -n security-license-manager
/sbin/ldconfig
systemctl daemon-reload
if [ $1 = 1 ]; then
@@ -208,13 +209,13 @@ if [ $1 = 2 ]; then
systemctl restart license-manager-agent.service
fi
-%preun -n license-manager
+%preun -n security-license-manager
if [ $1 = 0 ]; then
# unistall
systemctl stop license-manager-agent.service
fi
-%postun -n license-manager
+%postun -n security-license-manager
/sbin/ldconfig
if [ $1 = 0 ]; then
# unistall
@@ -304,7 +305,7 @@ chsmack -a System %{db_test_dir}/.security-manager-test.db-journal
%attr(0600,root,root) %{db_test_dir}/.security-manager-test.db
%attr(0600,root,root) %{db_test_dir}/.security-manager-test.db-journal
-%files -n license-manager
+%files -n security-license-manager
%{_libdir}/cynara/plugin/client/liblicense-manager-plugin-client.so
%{_libdir}/cynara/plugin/service/liblicense-manager-plugin-service.so
%{_bindir}/license-manager-agent