Merge from tizen_3.0

[platform/core/connectivity/net-config.git] / packaging / net-config.spec

diff --git a/packaging/net-config.spec b/packaging/net-config.spec
index 6003dcf..01e01e9 100755 (executable)
--- a/packaging/net-config.spec
+++ b/packaging/net-config.spec
@@ -1,6 +1,6 @@
 Name:          net-config
 Summary:       TIZEN Network Configuration service
-Version:       1.1.84
+Version:       1.1.94
 Release:       2
 Group:         System/Network
 License:       Apache-2.0
@@ -28,6 +28,8 @@ Requires(post):               systemd
 Requires(preun):       systemd
 Requires(postun):      systemd
 
+%define upgrade_script_path /usr/share/upgrade/scripts
+
 %description
 TIZEN Network Configuration service
 
@@ -55,6 +57,9 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
        -DTIZEN_TV=1 \
 %endif
 %endif
+%if "%{profile}" == "ivi"
+       -DTIZEN_NTP_ENABLE=1 \
+%endif
 %if 0%{?model_build_feature_wlan_wearable} == 1
        -DTIZEN_WEARABLE=1 \
        -DTIZEN_CAPTIVE_PORTAL=1 \
@@ -97,9 +102,6 @@ cp resources/usr/share/dbus-1/system-services/net.netconfig.service %{buildroot}
 mkdir -p %{buildroot}%{_sysconfdir}/
 cp resources/etc/resolv.conf %{buildroot}%{_sysconfdir}/resolv.conf
 
-mkdir -p %{buildroot}%{_sbindir}/
-cp resources/usr/sbin/net-config.service %{buildroot}%{_sbindir}/net-config.service
-
 #DBus DAC (net-config.manifest enables DBus SMACK)
 mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d
 cp resources/etc/dbus-1/system.d/net-config.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/net-config.conf
@@ -114,6 +116,10 @@ cp resources/usr/system/RestoreDir/softreset/network_softreset.sh %{buildroot}/u
 mkdir -p %{buildroot}%{_datadir}/license
 cp LICENSE %{buildroot}%{_datadir}/license/net-config
 
+#OS Upgrade
+mkdir -p %{buildroot}%{upgrade_script_path}
+cp -f scripts/netconfig_upgrade.sh %{buildroot}%{upgrade_script_path}
+
 %post
 chsmack -a 'System::Shared' %{_sysconfdir}/resolv.conf
 
@@ -141,8 +147,8 @@ ln -sf %{_unitdir}/net-config.service %{_sysconfdir}/systemd/default-extra-depen
 
 %files
 %manifest net-config.manifest
-%attr(500,root,root) %{_sbindir}/*
-%attr(644,root,root) %{_sysconfdir}/resolv.conf
+%attr(755,root,root) %{_sbindir}/*
+%attr(644,network_fw,network_fw) %{_sysconfdir}/resolv.conf
 %attr(644,root,root) %{_datadir}/dbus-1/system-services/*
 #DBus DAC
 %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/*
@@ -158,5 +164,6 @@ ln -sf %{_unitdir}/net-config.service %{_sysconfdir}/systemd/default-extra-depen
 %endif
 %if 0%{?model_build_feature_wlan_wearable} == 1
 %attr(700,root,root) /usr/system/RestoreDir/softreset/network_softreset.sh
-
 %endif
+%{upgrade_script_path}/netconfig_upgrade.sh
+