[connman]: Fixed: ConnMan keep trying connection infintely

[platform/upstream/connman.git] / packaging / connman.spec

diff --git a/packaging/connman.spec b/packaging/connman.spec
index b37b135..5db54f0 100755 (executable)
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -4,7 +4,7 @@
 
 Name:           connman
 Version:        1.29
-Release:        18
+Release:        20
 License:        GPL-2.0+
 Summary:        Connection Manager
 Url:            http://connman.net
@@ -34,6 +34,7 @@ Requires(preun):  systemd
 Requires(postun): systemd
 Requires:         net-config
 
+%define upgrade_script_filename 500.connman_upgrade.sh
 %define upgrade_script_path /usr/share/upgrade/scripts
 
 %description
@@ -142,6 +143,10 @@ mkdir -p %{buildroot}%{_unitdir}
 
 %if "%{profile}" == "tv"
 cp src/connman_tv.service %{buildroot}%{_libdir}/systemd/system/connman.service
+%if "%{?_lib}" == "lib64"
+cp src/connman_tv.service %{buildroot}%{_unitdir}/connman.service
+cp vpn/connman-vpn.service %{buildroot}%{_unitdir}/connman-vpn.service
+%endif
 %else
 %if "%{?_lib}" == "lib64"
 cp src/connman.service %{buildroot}%{_unitdir}/connman.service
@@ -193,7 +198,7 @@ cp vpn/vpn-dbus.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/connman-vpn-dbus
 
 #OS Upgrade
 mkdir -p %{buildroot}%{upgrade_script_path}
-cp -f scripts/connman_upgrade.sh %{buildroot}%{upgrade_script_path}
+cp -f scripts/%{upgrade_script_filename} %{buildroot}%{upgrade_script_path}
 
 %post
 chsmack -a 'System' /%{_localstatedir}/lib/connman
@@ -231,7 +236,7 @@ systemctl daemon-reload
 %attr(644,root,root) %{_libdir}/systemd/system/sockets.target.wants/connman.socket
 %endif
 %{_datadir}/license/connman
-%{upgrade_script_path}/connman_upgrade.sh
+%{upgrade_script_path}/%{upgrade_script_filename}
 
 %files test
 %manifest connman.manifest