Change mount dependency

Change-Id: I82ced2388454d519f12fced05b87e59dd46c7a00
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/packaging/media-server.path b/packaging/media-server.path
deleted file mode 100644 (file)
index 8755610..0000000
--- a/packaging/media-server.path
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=media-server path activation
-
-[Path]
-PathExists=/run/.unlock_mnt

diff --git a/packaging/media-server.service b/packaging/media-server.service
index d1b0bb7..ceda3e3 100644 (file)
--- a/packaging/media-server.service
+++ b/packaging/media-server.service
@@ -1,5 +1,7 @@
 [Unit]
 Description=Media server
+Wants=wait-mount@opt-usr.service
+After=wait-mount@opt-usr.service
 
 [Service]
 User=multimedia_fw

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index ccab111..4498ec3 100755 (executable)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -8,7 +8,6 @@ Source0:    %{name}-%{version}.tar.gz
 Source1:    media-server.service
 Source2:       media-server-user.service
 Source3:    media-server-user.path
-Source4:    media-server.path
 Source1001:     %{name}.manifest
 Source1002:     libmedia-utils.manifest
 Source1003:     libmedia-utils-devel.manifest
@@ -36,25 +35,12 @@ BuildRequires:  pkgconfig(deviced)
 %else
 %define product_tv 0
 %endif
-Provides:       %{name}-profile_common = %{version}-%{release}
-Provides:       %{name}-profile_wearable = %{version}-%{release}
-Provides:       %{name}-profile_tv = %{version}-%{release}
-Provides:       %{name}-profile_ivi = %{version}-%{release}
 
 %define upgrade_script_path /usr/share/upgrade/scripts
 
 %description
 Description: A server for media content management.
 
-%package service-extension
-Summary:       media-server service extension for Tizen mobile profile
-Requires:      %{name} = %{version}-%{release}
-Provides:      %{name}-profile_mobile = %{version}-%{release}
-%description service-extension
-Media-server's modified service files for mobile profile.
-Note that this package overwrites some of %{name} and you need to
-reinstall %{name} if you want to keep using %{name} after uninstalling this.
-
 %package -n libmedia-utils
 Summary:   The media server runtime library
 Group:     Multimedia/Libraries
@@ -111,9 +97,6 @@ install -m 644 %{SOURCE2} %{buildroot}%{_unitdir_user}/media-server-user.service
 install -m 644 %{SOURCE3} %{buildroot}%{_unitdir_user}/media-server-user.path
 %endif
 
-# for mobile
-install -m 644 %{SOURCE4} %{buildroot}%{_unitdir}/media-server.path
-# for non-mobile
 ln -s ../media-server.service %{buildroot}%{_unitdir}/multi-user.target.wants/media-server.service
 
 #ini file
@@ -176,12 +159,3 @@ chmod 755 /etc/gumd/useradd.d/30_media-server-add.post
 %{_libdir}/libmedia-utils.so
 %{_libdir}/pkgconfig/libmedia-utils.pc
 %{_includedir}/media-utils/*.h
-
-%post service-extension
-rm %{_unitdir}/multi-user.target.wants/media-server.service
-ln -sf ../media-server.path  %{_unitdir}/multi-user.target.wants/
-%preun service-extension
-rm %{_unitdir}/multi-user.target.wants/media-server.path
-
-%files service-extension
-%{_unitdir}/media-server.path