summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Jiung <jiung.yu@samsung.com>2016-02-16 10:04:05 (GMT)
committerYu Jiung <jiung.yu@samsung.com>2016-02-16 10:04:05 (GMT)
commitcdd2029ca7173fb2231f7cd0b8be8ef7503f4034 (patch)
tree2874ff80580c660eb641bffb95f01465a8af1f12
parent02826b927425b107b0ee899f2664f951f2b6ba0b (diff)
downloadconnman-cdd2029ca7173fb2231f7cd0b8be8ef7503f4034.zip
connman-cdd2029ca7173fb2231f7cd0b8be8ef7503f4034.tar.gz
connman-cdd2029ca7173fb2231f7cd0b8be8ef7503f4034.tar.bz2
Change-Id: Ia751c1ec13fb119616063e922c691c3d3147bc98
-rwxr-xr-xpackaging/connman.spec21
1 files changed, 17 insertions, 4 deletions
diff --git a/packaging/connman.spec b/packaging/connman.spec
index 464a0c2..3fbe789 100755
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -140,7 +140,6 @@ mkdir -p %{buildroot}%{_unitdir}
%if "%{profile}" == "tv"
cp src/connman_tv.service %{buildroot}%{_libdir}/systemd/system/connman.service
%else
-cp src/connman.service %{buildroot}%{_libdir}/systemd/system/connman.service
%if "%{?_lib}" == "lib64"
cp src/connman.service %{buildroot}%{_unitdir}/connman.service
%endif
@@ -169,7 +168,17 @@ mkdir -p %{buildroot}%{_datadir}/license
cp COPYING %{buildroot}%{_datadir}/license/connman
%if %{with connman_vpnd}
-#%install_service multi-user.target.wants connman-vpn.service
+#Systemd service file
+%if "%{?_lib}" == "lib64"
+cp vpn/connman-vpn.service %{buildroot}%{_unitdir}/connman-vpn.service
+%endif
+
+mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
+ln -s ../connman-vpn.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/connman-vpn.service
+%if "%{?_lib}" == "lib64"
+mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
+ln -s ../connman-vpn.service %{buildroot}%{_unitdir}/multi-user.target.wants/connman-vpn.service
+%endif
cp vpn/vpn-dbus.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/connman-vpn-dbus.conf
%endif
@@ -245,8 +254,12 @@ systemctl daemon-reload
%files connman-vpnd
%manifest %{name}.manifest
%{_sbindir}/connman-vpnd
-%{_unitdir}/connman-vpn.service
-#%{_unitdir}/multi-user.target.wants/connman-vpn.service
+%attr(644,root,root) %{_libdir}/systemd/system/connman-vpn.service
+%attr(644,root,root) %{_libdir}/systemd/system/multi-user.target.wants/connman-vpn.service
+%if "%{?_lib}" == "lib64"
+%attr(644,root,root) %{_unitdir}/connman-vpn.service
+%attr(644,root,root) %{_unitdir}/multi-user.target.wants/connman-vpn.service
+%endif
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/scripts
%dir %{_libdir}/%{name}/plugins-vpn