Added dump log for connect fail

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

diff --git a/packaging/net-config.spec b/packaging/net-config.spec
index a57b96a..099cd37 100755 (executable)
--- a/packaging/net-config.spec
+++ b/packaging/net-config.spec
@@ -1,7 +1,7 @@
 Name:          net-config
 Summary:       TIZEN Network Configuration service
-Version:       1.1.122
-Release:       2
+Version:       1.1.135
+Release:       3
 Group:         System/Network
 License:       Apache-2.0
 Source0:       %{name}-%{version}.tar.gz
@@ -14,12 +14,14 @@ BuildRequires:      pkgconfig(capi-vpnsvc)
 BuildRequires: cmake
 BuildRequires: pkgconfig(sqlite3)
 BuildRequires: pkgconfig(libtzplatform-config)
-BuildRequires:  pkgconfig(key-manager)
-BuildRequires:  pkgconfig(libnl-2.0)
+BuildRequires: pkgconfig(key-manager)
+BuildRequires: pkgconfig(libnl-2.0)
 Requires:              vconf
 Requires:              connman
 Requires:              systemd
 Requires:              security-config
+Requires:              iproute2
+Requires:              iptables
 Requires(post):                systemd
 Requires(preun):       systemd
 Requires(postun):      systemd
@@ -61,21 +63,19 @@ Requires:       %{name} = %{version}-%{release}
 %description plugin-telephony
 TIZEN Network Configuration service extension for telephony FW.
 
+%package haltests
+Summary:        net-config extension for HAL test
+BuildRequires: pkgconfig(gmock)
+BuildRequires: pkgconfig(capi-network-wifi-manager)
+BuildRequires: pkgconfig(capi-network-wifi-direct)
+BuildRequires: pkgconfig(capi-network-softap)
+Requires:       %{name} = %{version}-%{release}
+%description haltests
+TIZEN Network Configuration service extension for HAL test.
+
 %prep
 %setup -q
 
-# NOTE: the following macros are undefined.
-# PLEASE DO NOT USE model_build_features in the future with Tizen 4.0+.
-#{?model_build_feature_wlan_concurrent_mode}
-#{?model_build_feature_wlan_p2p_disable}
-#{?model_build_feature_network_tethering_disable}
-#{?model_build_feature_wlan_wearable}
-# In case, we have commercializing team using such unwelcomed
-# macros in their productin build, we are keeping those.
-# However, it is recommended to remove all if/endif with model_build_feature
-
-# NOTE: Are we really going to make "mobile" == "SPRD"?
-
 %build
 # Build for wearable
 cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
@@ -85,6 +85,9 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
        -DTIZEN_WEARABLE=1 \
        -DTIZEN_CAPTIVE_PORTAL=1 \
        -DLIB_PATH=%{_lib} \
+       -DBIN_DIR=%{_bindir} \
+       -DBUILD_GTESTS=%{?gtests:1}%{!?gtests:0} \
+       -DBUILD_GCOV=%{?gcov:1}%{!?gcov:0} \
        .
 
 %make_install
@@ -98,12 +101,12 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
        -DTIZEN_WLAN_PASSPOINT=1 \
        -DTIZEN_WLAN_USE_P2P_INTERFACE=1 \
        -DTIZEN_DEBUG_ENABLE=1 \
-%if 0%{?model_build_feature_wlan_concurrent_mode}
-       -DWLAN_CONCURRENT_MODE=1 \
-%endif
        -DTIZEN_WEARABLE=0 \
        -DTIZEN_CAPTIVE_PORTAL=0 \
        -DLIB_PATH=%{_lib} \
+       -DBIN_DIR=%{_bindir} \
+       -DBUILD_GTESTS=%{?gtests:1}%{!?gtests:0} \
+       -DBUILD_GCOV=%{?gcov:1}%{!?gcov:0} \
        .
 
 make %{?_smp_mflags}
@@ -152,8 +155,10 @@ cp resources/etc/dbus-1/system.d/net-config.conf %{buildroot}%{_sysconfdir}/dbus
 #log dump
 mkdir -p %{buildroot}/opt/etc/dump.d/module.d/
 cp resources/opt/etc/dump.d/module.d/network_dump.sh %{buildroot}/opt/etc/dump.d/module.d/network_dump.sh
+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_dump.sh %{buildroot}/opt/var/lib/net-config/network_dump.sh
+cp resources/opt/etc/dump.d/module.d/network_log_dump.sh %{buildroot}/opt/var/lib/net-config/network_log_dump.sh
 
 #softreset scripts
 mkdir -p %{buildroot}/usr/system/RestoreDir/softreset
@@ -191,6 +196,7 @@ ln -sf %{_unitdir}/net-config.service %{_sysconfdir}/systemd/default-extra-depen
 %files
 %manifest net-config.manifest
 %attr(500,network_fw,network_fw) %{_bindir}/*
+%exclude %{_bindir}/net-config.wearable
 %attr(644,network_fw,network_fw) %{_sysconfdir}/resolv.conf
 %attr(644,network_fw,network_fw) %{TZ_SYS_ETC}/resolv.conf
 %attr(644,root,root) %{_datadir}/dbus-1/system-services/*
@@ -198,17 +204,16 @@ ln -sf %{_unitdir}/net-config.service %{_sysconfdir}/systemd/default-extra-depen
 %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/*
 %attr(644,root,root) %{_libdir}/systemd/system/net-config.service
 %attr(644,root,root) %{_libdir}/systemd/system/multi-user.target.wants/net-config.service
-%attr(644,network_fw,network_fw) /usr/lib/tmpfiles.d/security-network-config.conf
+%attr(644,root,root) /usr/lib/tmpfiles.d/security-network-config.conf
 %if "%{?_lib}" == "lib64"
 %attr(644,root,root) %{_unitdir}/net-config.service
 %attr(644,root,root) %{_unitdir}/multi-user.target.wants/net-config.service
 %endif
 %license LICENSE
-%attr(500,root,root) /opt/etc/dump.d/module.d/network_dump.sh
-%attr(500,network_fw,network_fw) /opt/var/lib/net-config/network_dump.sh
-%if 0%{?model_build_feature_wlan_wearable} == 1
-%attr(700,network_fw,network_fw) /usr/system/RestoreDir/softreset/network_softreset.sh
-%endif
+%attr(750,network_fw,network_fw) /opt/etc/dump.d/module.d/network_dump.sh
+%attr(750,network_fw,network_fw) /opt/var/lib/net-config/network_dump.sh
+%attr(750,network_fw,network_fw) /opt/etc/dump.d/module.d/network_log_dump.sh
+%attr(750,network_fw,network_fw) /opt/var/lib/net-config/network_log_dump.sh
 
 #### tv profile ####
 %post profile_tv
@@ -233,7 +238,7 @@ pushd %{_bindir}
 mv net-config.wearable net-config
 
 %files profile_wearable
-%attr(644,root,root) %{_bindir}/net-config.wearable
+%attr(500,network_fw,network_fw) %{_bindir}/net-config.wearable
 %attr(644,network_fw,network_fw) /usr/system/RestoreDir/softreset/network_softreset.sh
 
 #### plugin ####
@@ -244,3 +249,8 @@ mv net-config.wearable net-config
 %files plugin-telephony
 %manifest net-config.manifest
 %attr(500,network_fw,network_fw) %{_libdir}/net-config-plugin-telephony.so
+
+%files haltests
+%manifest net-config.manifest
+%{_bindir}/*hal_tc
+