X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fnet-config.spec;h=c37ef806aefb0a294823cd73bdc2ac3bfb006836;hb=0ed4681a9d168534838c79b4cfb20c301a6571da;hp=3b8cfff38c097240e60a3bb94970390e718d0d38;hpb=5f2c4f9c937b2c6e158b44d2655ec4a4c1200bfd;p=platform%2Fcore%2Fconnectivity%2Fnet-config.git

diff --git a/packaging/net-config.spec b/packaging/net-config.spec
index 3b8cfff..c37ef80 100755
--- 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.123
-Release:	2
+Version:	1.1.136
+Release:	3
 Group:		System/Network
 License:	Apache-2.0
 Source0:	%{name}-%{version}.tar.gz
@@ -14,14 +14,15 @@ 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:		tcpdump
 Requires(post):		systemd
 Requires(preun):	systemd
 Requires(postun):	systemd
@@ -63,6 +64,16 @@ 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
 
@@ -71,10 +82,13 @@ TIZEN Network Configuration service extension for telephony FW.
 cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
 	-DTIZEN_WLAN_PASSPOINT=1 \
 	-DTIZEN_WLAN_USE_P2P_INTERFACE=1 \
-	-DTIZEN_DEBUG_ENABLE=1 \
+	-DTIZEN_DEBUG_ENABLE=0 \
 	-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
@@ -91,6 +105,9 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
 	-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}
@@ -139,8 +156,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
@@ -178,6 +197,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/*
@@ -191,8 +211,10 @@ ln -sf %{_unitdir}/net-config.service %{_sysconfdir}/systemd/default-extra-depen
 %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
+%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
@@ -202,7 +224,7 @@ mv %{_unitdir}/net-config.service.tv %{_unitdir}/net-config.service
 %endif
 
 %files profile_tv
-%attr(644,network_fw,network_fw) %{_libdir}/udev/rules.d/99-wifiusb-dev.rules
+%attr(644,root,root) %{_libdir}/udev/rules.d/99-wifiusb-dev.rules
 %attr(644,root,root) %{_libdir}/systemd/system/net-config.service.tv
 %if "%{?_lib}" == "lib64"
 %attr(644,root,root) %{_unitdir}/net-config.service.tv
@@ -217,7 +239,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 ####
@@ -228,3 +250,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}/*haltests
+