Modify the installed path of service file

Change-Id: Ieeb5bde229c3f20c3916c32a852d29c60efc103d

diff --git a/packaging/mused-server.socket b/packaging/mused-server.socket
index 900c392..02f8676 100644 (file)
--- a/packaging/mused-server.socket
+++ b/packaging/mused-server.socket
@@ -1,6 +1,4 @@
 [Socket]
-SocketUser=system
-SocketGroup=system
 ListenStream=/tmp/.mmsvc_core_socket
 Service=mused-server.service
 

diff --git a/packaging/mused.spec b/packaging/mused.spec
index f74ed43..925d5fc 100644 (file)
--- a/packaging/mused.spec
+++ b/packaging/mused.spec
@@ -55,36 +55,34 @@ cp mused-server %{buildroot}/usr/bin
 
 %make_install
 
-mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
-install -m 0644 %SOURCE1 %{buildroot}%{_libdir}/systemd/system/mused-server.service
-ln -s ../mused-server.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/mused-server.service
+mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
+install -m 0644 %SOURCE1 %{buildroot}%{_unitdir}/mused-server.service
+%install_service multi-user.target.wants mused-server.service
+
+mkdir -p %{buildroot}%{_unitdir}/sockets.target.wants
+install -m 0644 %SOURCE2 %{buildroot}%{_unitdir}/mused-server.socket
+%install_service sockets.target.wants mused-server.socket
 
-mkdir -p %{buildroot}%{_libdir}/systemd/system/sockets.target.wants
-install -m 0644 %SOURCE2 %{buildroot}%{_libdir}/systemd/system/mused-server.socket
-ln -s ../mused-server.socket %{buildroot}%{_libdir}/systemd/system/sockets.target.wants/mused-server.socket
 
 %post
 /sbin/ldconfig
-chown 200:200 %{_libdir}/systemd/system/mused-server.socket
 
 %postun -p /sbin/ldconfig
 
 
 %files
 %manifest mused.manifest
-%defattr(-,system,system,-)
 %{_libdir}/libmused.so.*
 %{_datadir}/license/%{name}
-%{_libdir}/systemd/system/mused-server.service
-%{_libdir}/systemd/system/multi-user.target.wants/mused-server.service
-%{_libdir}/systemd/system/sockets.target.wants/mused-server.socket
-%{_libdir}/systemd/system/mused-server.socket
+%{_unitdir}/mused-server.service
+%{_unitdir}/multi-user.target.wants/mused-server.service
+%{_unitdir}/mused-server.socket
+%{_unitdir}/sockets.target.wants/mused-server.socket
 %{_datadir}/mused/mused.conf
 /usr/bin/*
 
 
 %files devel
-%defattr(-,system,system,-)
 %{_includedir}/media/*.h
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/libmused.so