projects / platform / core / connectivity / net-config.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Replaced strncpy() with g_strlcpy() in wifi-power.c
[platform/core/connectivity/net-config.git] / packaging / net-config.spec
diff --git a/packaging/net-config.spec b/packaging/net-config.spec
index 889544f..b3e4057 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.42
+Version:       1.1.100
 Release:       2
 Group:         System/Network
 License:       Apache-2.0
@@ -17,7 +17,10 @@ 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)
 Requires:              vconf
 Requires:              connman
 Requires:              systemd
@@ -25,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
 
@@ -44,9 +49,17 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
 %if ! 0%{?model_build_feature_network_tethering_disable}
        -DTIZEN_TETHERING_ENABLE=1 \
 %endif
+%if "%{profile}" == "mobile"
+       -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 \
@@ -69,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"
@@ -86,42 +102,36 @@ 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}%{_sbindir}/
-cp resources/usr/sbin/net-config.service %{buildroot}%{_sbindir}/net-config.service
+mkdir -p %{buildroot}%{TZ_SYS_ETC}
+cp resources/etc/resolv.conf %{buildroot}%{TZ_SYS_ETC}/resolv.conf
+mkdir -p %{buildroot}/usr/share/upgrade/data/
+cp resources/etc/resolv.conf %{buildroot}/usr/share/upgrade/data/resolv.conf
 
-mkdir -p %{buildroot}/usr/dbspace
-sqlite3 %{buildroot}/usr/dbspace/.wifi_offload.db < resources/usr/share/wifi_offloading.sql
+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
 cp resources/etc/dbus-1/system.d/net-config.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/net-config.conf
 
-#log dump
-mkdir -p %{buildroot}/opt/etc/dump.d/module.d/
-cp resources/opt/etc/dump.d/module.d/network_log_dump.sh %{buildroot}/opt/etc/dump.d/module.d/network_log_dump.sh
-mkdir -p %{buildroot}/opt/var/lib/net-config/
-cp resources/opt/etc/dump.d/module.d/network_log_dump.sh %{buildroot}/opt/var/lib/net-config/network_log_dump.sh
-cp resources/opt/etc/dump.d/module.d/network_dump.sh %{buildroot}/opt/var/lib/net-config/network_dump.sh
-
 %if 0%{?model_build_feature_wlan_wearable} == 1
 #softreset scripts
 mkdir -p %{buildroot}/usr/system/RestoreDir/softreset
 cp resources/usr/system/RestoreDir/softreset/network_softreset.sh %{buildroot}/usr/system/RestoreDir/softreset/network_softreset.sh
 %endif
 
-#License
-mkdir -p %{buildroot}%{_datadir}/license
-cp LICENSE %{buildroot}%{_datadir}/license/net-config
+#OS Upgrade
+mkdir -p %{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
-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/
@@ -144,6 +154,8 @@ 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) /usr/share/upgrade/data/resolv.conf
 %attr(644,root,root) %{_datadir}/dbus-1/system-services/*
 #DBus DAC
 %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/*
@@ -153,16 +165,12 @@ ln -sf %{_unitdir}/net-config.service %{_sysconfdir}/systemd/default-extra-depen
 %attr(644,root,root) %{_unitdir}/net-config.service
 %attr(644,root,root) %{_unitdir}/multi-user.target.wants/net-config.service
 %endif
-%{_datadir}/license/net-config
-%attr(660,root,root) /usr/dbspace/.wifi_offload.db
-%attr(664,root,root) /usr/dbspace/.wifi_offload.db-journal
-%attr(500,root,root) /opt/etc/dump.d/module.d/network_log_dump.sh
-%attr(500,root,root) /opt/var/lib/net-config/network_log_dump.sh
-%attr(500,root,root) /opt/var/lib/net-config/network_dump.sh
+%license LICENSE
 %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}/500.netconfig_upgrade.sh
+
Domain: Network & Connectivity / Data Network;