Merge "[SPIN] Enable the ntp by connman if device does not use the cellular." into...

diff --combined packaging/connman.spec
index 4bf2d1a,93642e8..47f8552
--- 1/packaging/connman.spec
--- 2/packaging/connman.spec
+++ b/packaging/connman.spec
@@@ -4,7 -4,7 +4,7 @@@
  
  Name:           connman
  Version:        1.29
 -Release:        9
 +Release:        11
  License:        GPL-2.0+
  Summary:        Connection Manager
  Url:            http://connman.net
@@@ -15,6 -15,7 +15,6 @@@ BuildRequires:  pkgconfig(dbus-1
  BuildRequires:  pkgconfig(glib-2.0)
  BuildRequires:  pkgconfig(libiptc)
  BuildRequires:  pkgconfig(xtables)
 -BuildRequires:  pkgconfig(gnutls)
  BuildRequires:  pkgconfig(libsmack)
  BuildRequires:  pkgconfig(tpkp-gnutls)
  %if %{with connman_openconnect}
@@@ -99,6 -100,10 +99,10 @@@ CFLAGS+=" -DTIZEN_TV_EXT
  
  %if %{with connman_vpnd}
  VPN_CFLAGS+=" -DTIZEN_EXT -lsmack -Werror"
+ 
+ %if 0%{?sec_product_feature_telephony_disable} == 1
+        CFLAGS+=" -DTIZEN_CONNMAN_NTP"
+ %endif
  %endif
  
  chmod +x bootstrap
@@@ -123,8 -128,7 +127,8 @@@
                        --enable-loopback \
                        --enable-ethernet \
              --with-systemdunitdir=%{_libdir}/systemd/system \
 -            --enable-pie
 +            --enable-pie \
 +                      --disable-wispr
  
  make %{?_smp_mflags}
  
@@@ -142,7 -146,6 +146,7 @@@ cp src/connman_tv.service %{buildroot}%
  %else
  %if "%{?_lib}" == "lib64"
  cp src/connman.service %{buildroot}%{_unitdir}/connman.service
 +cp vpn/connman-vpn.service %{buildroot}%{_unitdir}/connman-vpn.service
  %endif
  %endif
  
@@@ -194,11 -197,9 +198,11 @@@ systemctl daemon-reloa
  %{_sysconfdir}/dbus-1/system.d/*.conf
  %attr(644,root,root) %{_libdir}/systemd/system/connman.service
  %attr(644,root,root) %{_libdir}/systemd/system/multi-user.target.wants/connman.service
 +%attr(644,root,root) %{_libdir}/systemd/system/connman-vpn.service
  %if "%{?_lib}" == "lib64"
  %attr(644,root,root) %{_unitdir}/connman.service
  %attr(644,root,root) %{_unitdir}/multi-user.target.wants/connman.service
 +%attr(644,root,root) %{_unitdir}/connman-vpn.service
  %endif
  %{_datadir}/license/connman