X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fnet-config.spec;h=89052f0c95865b6065707983ec757a9edd49c554;hb=refs%2Ftags%2Fsubmit%2Ftizen_4.0%2F20171127.021205;hp=1935dce0e3c118dfe6115719383000ac8569e0cf;hpb=7e7544508e31c3f98f5a240a58bd0e93d8dc1e22;p=platform%2Fcore%2Fconnectivity%2Fnet-config.git

diff --git a/packaging/net-config.spec b/packaging/net-config.spec
index 1935dce..89052f0 100755
--- a/packaging/net-config.spec
+++ b/packaging/net-config.spec
@@ -1,17 +1,15 @@
 Name:		net-config
 Summary:	TIZEN Network Configuration service
-Version:	1.1.107
+Version:	1.1.117
 Release:	2
 Group:		System/Network
 License:	Apache-2.0
 Source0:	%{name}-%{version}.tar.gz
 BuildRequires:	pkgconfig(dlog)
-BuildRequires:	pkgconfig(tapi)
 BuildRequires:	pkgconfig(vconf)
 BuildRequires:	pkgconfig(gio-2.0)
 BuildRequires:	pkgconfig(glib-2.0)
 BuildRequires:	pkgconfig(capi-system-info)
-BuildRequires:	pkgconfig(capi-network-wifi-direct)
 BuildRequires:	pkgconfig(capi-vpnsvc)
 BuildRequires:	cmake
 BuildRequires:	pkgconfig(sqlite3)
@@ -19,6 +17,7 @@ BuildRequires:	pkgconfig(libtzplatform-config)
 Requires:		vconf
 Requires:		connman
 Requires:		systemd
+Requires:		security-config
 Requires(post):		systemd
 Requires(preun):	systemd
 Requires(postun):	systemd
@@ -27,8 +26,6 @@ Provides:       %{name}-profile_mobile = %{version}-%{release}
 Provides:       %{name}-profile_wearable = %{version}-%{release}
 Provides:       %{name}-profile_ivi = %{version}-%{release}
 
-%define upgrade_script_path /usr/share/upgrade/scripts
-
 %description
 TIZEN Network Configuration service
 
@@ -49,6 +46,13 @@ Requires:       %{name} = %{version}-%{release}
 %description plugin-headed
 TIZEN Network Configuration service extension for headed profile.
 
+%package plugin-telephony
+Summary:        net-config extension for telephony FW
+BuildRequires:	pkgconfig(tapi)
+Requires:       %{name} = %{version}-%{release}
+%description plugin-telephony
+TIZEN Network Configuration service extension for telephony FW.
+
 %prep
 %setup -q
 
@@ -133,17 +137,14 @@ 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
 
-#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
+mkdir -p /opt/usr/data/network
+chmod 755 /opt/usr/data/network
+chown network_fw:network_fw /opt/usr/data/network
 #chsmack -a 'System' /opt/usr/data/network
 
 #Add net-config.service to systemd extra default dependency ignore list
@@ -165,23 +166,23 @@ 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(644,root,root) %{TZ_SYS_ETC}/resolv.conf
+%attr(500,network_fw,network_fw) %{_bindir}/*
+%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/*
 #DBus DAC
 %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
 %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
 %if 0%{?model_build_feature_wlan_wearable} == 1
-%attr(700,root,root) /usr/system/RestoreDir/softreset/network_softreset.sh
+%attr(700,network_fw,network_fw) /usr/system/RestoreDir/softreset/network_softreset.sh
 %endif
-%{upgrade_script_path}/500.netconfig_upgrade.sh
 
 %post profile_tv
 mv %{_libdir}/systemd/system/net-config.service.tv %{_libdir}/systemd/system/net-config.service
@@ -189,7 +190,7 @@ mv %{_libdir}/systemd/system/net-config.service.tv %{_libdir}/systemd/system/net
 mv %{_unitdir}/net-config.service.tv %{_unitdir}/net-config.service
 %endif
 %files profile_tv
-%attr(644,root,root) %{_libdir}/udev/rules.d/99-wifiusb-dev.rules
+%attr(644,network_fw,network_fw) %{_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
@@ -197,4 +198,8 @@ mv %{_unitdir}/net-config.service.tv %{_unitdir}/net-config.service
 
 %files plugin-headed
 %manifest net-config.manifest
-%attr(500,root,root) %{_libdir}/net-config-plugin-headed.so
+%attr(500,network_fw,network_fw) %{_libdir}/net-config-plugin-headed.so
+
+%files plugin-telephony
+%manifest net-config.manifest
+%attr(500,network_fw,network_fw) %{_libdir}/net-config-plugin-telephony.so