Change path of resolv.conf from /etc to /opt/etc and make symbolic link between them

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

diff --git a/packaging/net-config.spec b/packaging/net-config.spec
index 330d86e..f9dea18 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.86
+Version:       1.1.98
 Release:       2
 Group:         System/Network
 License:       Apache-2.0
@@ -57,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 \
@@ -79,6 +82,9 @@ mkdir -p %{buildroot}%{_unitdir}
 cp resources/usr/lib/systemd/system/net-config_tv.service %{buildroot}%{_libdir}/systemd/system/net-config.service
 mkdir -p %{buildroot}%{_libdir}/udev/rules.d/
 cp resources/usr/lib/udev/rules.d/99-wifiusb-dev.rules %{buildroot}%{_libdir}/udev/rules.d/99-wifiusb-dev.rules
+%if "%{?_lib}" == "lib64"
+cp resources/usr/lib/systemd/system/net-config_tv.service %{buildroot}%{_unitdir}/net-config.service
+%endif
 %else
 cp resources/usr/lib/systemd/system/net-config.service %{buildroot}%{_libdir}/systemd/system/net-config.service
 %if "%{?_lib}" == "lib64"
@@ -96,11 +102,11 @@ ln -s ../net-config.service %{buildroot}%{_unitdir}/multi-user.target.wants/net-
 mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services/
 cp resources/usr/share/dbus-1/system-services/net.netconfig.service %{buildroot}%{_datadir}/dbus-1/system-services/net.netconfig.service
 
-mkdir -p %{buildroot}%{_sysconfdir}/
-cp resources/etc/resolv.conf %{buildroot}%{_sysconfdir}/resolv.conf
+mkdir -p %{buildroot}%{TZ_SYS_ETC}
+cp resources/etc/resolv.conf %{buildroot}%{TZ_SYS_ETC}/resolv.conf
 
-mkdir -p %{buildroot}%{_sbindir}/
-cp resources/usr/sbin/net-config.service %{buildroot}%{_sbindir}/net-config.service
+mkdir -p %{buildroot}%{_sysconfdir}
+ln -s %{TZ_SYS_ETC}/resolv.conf %{buildroot}%{_sysconfdir}/resolv.conf
 
 #DBus DAC (net-config.manifest enables DBus SMACK)
 mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d
@@ -118,10 +124,11 @@ 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}
+cp -f scripts/500.netconfig_upgrade.sh %{buildroot}%{upgrade_script_path}
 
 %post
 chsmack -a 'System::Shared' %{_sysconfdir}/resolv.conf
+chsmack -a 'System::Shared' %{TZ_SYS_ETC}/resolv.conf
 
 #Network logs
 #mkdir -p /opt/usr/data/network
@@ -149,6 +156,7 @@ ln -sf %{_unitdir}/net-config.service %{_sysconfdir}/systemd/default-extra-depen
 %manifest net-config.manifest
 %attr(500,root,root) %{_sbindir}/*
 %attr(644,root,root) %{_sysconfdir}/resolv.conf
+%attr(644,root,root) %{TZ_SYS_ETC}/resolv.conf
 %attr(644,root,root) %{_datadir}/dbus-1/system-services/*
 #DBus DAC
 %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/*
@@ -165,5 +173,5 @@ ln -sf %{_unitdir}/net-config.service %{_sysconfdir}/systemd/default-extra-depen
 %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
+%{upgrade_script_path}/500.netconfig_upgrade.sh