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 36965c8..01e01e9 100755 (executable)
--- a/packaging/net-config.spec
+++ b/packaging/net-config.spec
@@ -1,11 +1,10 @@
 Name:          net-config
 Summary:       TIZEN Network Configuration service
-Version:       1.1.69
+Version:       1.1.94
 Release:       2
 Group:         System/Network
 License:       Apache-2.0
 Source0:       %{name}-%{version}.tar.gz
-BuildRequires: pkgconfig(aul)
 BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(tapi)
 BuildRequires: pkgconfig(vconf)
@@ -18,6 +17,7 @@ BuildRequires:        pkgconfig(syspopup-caller)
 BuildRequires: pkgconfig(capi-system-info)
 BuildRequires: pkgconfig(capi-appfw-application)
 BuildRequires: pkgconfig(capi-network-wifi-direct)
+BuildRequires: pkgconfig(capi-vpnsvc)
 BuildRequires: cmake
 BuildRequires: pkgconfig(sqlite3)
 BuildRequires: pkgconfig(libtzplatform-config)
@@ -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
 
@@ -48,12 +50,16 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
        -DTIZEN_TETHERING_ENABLE=1 \
 %endif
 %if "%{profile}" == "mobile"
-        -DTIZEN_TELEPHONY_ENABLE=1 \
+       -DTIZEN_TELEPHONY_ENABLE=1 \
+       -DTIZEN_WLAN_BOARD_SPRD=1 \
 %else
 %if "%{profile}" == "tv"
        -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 \
@@ -96,23 +102,10 @@ 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
-
-mkdir -p %{buildroot}%{TZ_SYS_DB}
-sqlite3 %{buildroot}%{TZ_SYS_DB}/.wifi_offload.db < resources/usr/share/wifi_offloading.sql
-
 #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
 
-#log dump
-mkdir -p %{buildroot}%{TZ_SYS_ETC}/dump.d/module.d/
-cp resources/opt/etc/dump.d/module.d/network_log_dump.sh %{buildroot}%{TZ_SYS_ETC}/dump.d/module.d/network_log_dump.sh
-mkdir -p %{buildroot}%{TZ_SYS_VAR}/lib/net-config/
-cp resources/opt/etc/dump.d/module.d/network_log_dump.sh %{buildroot}%{TZ_SYS_VAR}/lib/net-config/network_log_dump.sh
-cp resources/opt/etc/dump.d/module.d/network_dump.sh %{buildroot}%{TZ_SYS_VAR}/lib/net-config/network_dump.sh
-
 %if 0%{?model_build_feature_wlan_wearable} == 1
 #softreset scripts
 mkdir -p %{buildroot}/usr/system/RestoreDir/softreset
@@ -123,12 +116,17 @@ 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
 
 #Network logs
-mkdir -p /opt/usr/data/network
-chmod 755 /opt/usr/data/network
-chsmack -a net-config::logging /opt/usr/data/network
+#mkdir -p /opt/usr/data/network
+#chmod 755 /opt/usr/data/network
+#chsmack -a 'System' /opt/usr/data/network
 
 #Add net-config.service to systemd extra default dependency ignore list
 mkdir -p %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/
@@ -149,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/*
@@ -161,15 +159,11 @@ ln -sf %{_unitdir}/net-config.service %{_sysconfdir}/systemd/default-extra-depen
 %attr(644,root,root) %{_unitdir}/multi-user.target.wants/net-config.service
 %endif
 %{_datadir}/license/net-config
-%attr(660,root,root) %{TZ_SYS_DB}/.wifi_offload.db
-%attr(664,root,root) %{TZ_SYS_DB}/.wifi_offload.db-journal
-%attr(500,root,root) %{TZ_SYS_ETC}/dump.d/module.d/network_log_dump.sh
-%attr(500,root,root) %{TZ_SYS_VAR}/lib/net-config/network_log_dump.sh
-%attr(500,root,root) %{TZ_SYS_VAR}/lib/net-config/network_dump.sh
 %if "%{profile}" == "tv"
 %attr(644,root,root) %{_libdir}/udev/rules.d/99-wifiusb-dev.rules
 %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
+