X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fnet-config.spec;h=f7e2c1bae7be4b4713d8b2605475f78369b28f28;hb=0e12e098221e7f979fe96f28b1501a98a8ef5f4c;hp=2fc78021121c7aec94f550a09c11531e35126192;hpb=909801d6f4b1e2911479f72b594f39269e893fc3;p=platform%2Fcore%2Fconnectivity%2Fnet-config.git diff --git a/packaging/net-config.spec b/packaging/net-config.spec index 2fc7802..f7e2c1b 100755 --- 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.96 +Version: 1.1.110 Release: 2 Group: System/Network License: Apache-2.0 @@ -8,14 +8,9 @@ Source0: %{name}-%{version}.tar.gz BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(tapi) BuildRequires: pkgconfig(vconf) -BuildRequires: pkgconfig(bundle) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(eventsystem) -BuildRequires: pkgconfig(alarm-service) -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 @@ -27,15 +22,48 @@ Requires: systemd Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +Provides: %{name}-profile_common = %{version}-%{release} +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 +%package profile_tv +Summary: net-config extension for TV profile +Requires: %{name} = %{version}-%{release} +%description profile_tv +TIZEN Network Configuration service extension for Tizen TV profile. + +%package plugin-headed +Summary: net-config extension for headed profile +BuildRequires: pkgconfig(bundle) +BuildRequires: pkgconfig(eventsystem) +BuildRequires: pkgconfig(alarm-service) +BuildRequires: pkgconfig(syspopup-caller) +BuildRequires: pkgconfig(capi-appfw-application) +Requires: %{name} = %{version}-%{release} +%description plugin-headed +TIZEN Network Configuration service extension for headed profile. + %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 cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DTIZEN_WLAN_PASSPOINT=1 \ @@ -49,21 +77,11 @@ 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 \ %endif + -DLIB_PATH=%{_lib} \ . make %{?_smp_mflags} @@ -78,19 +96,16 @@ mkdir -p %{buildroot}%{_libdir}/systemd/system/ mkdir -p %{buildroot}%{_unitdir} %endif -%if "%{profile}" == "tv" -cp resources/usr/lib/systemd/system/net-config_tv.service %{buildroot}%{_libdir}/systemd/system/net-config.service +cp resources/usr/lib/systemd/system/net-config_tv.service %{buildroot}%{_libdir}/systemd/system/net-config.service.tv 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 +cp resources/usr/lib/systemd/system/net-config_tv.service %{buildroot}%{_unitdir}/net-config.service.tv %endif -%else cp resources/usr/lib/systemd/system/net-config.service %{buildroot}%{_libdir}/systemd/system/net-config.service %if "%{?_lib}" == "lib64" cp resources/usr/lib/systemd/system/net-config.service %{buildroot}%{_unitdir}/net-config.service %endif -%endif mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/ ln -s ../net-config.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/net-config.service @@ -102,8 +117,13 @@ 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}%{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}%{_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 @@ -115,16 +135,13 @@ 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 @@ -152,6 +169,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/* @@ -161,12 +180,24 @@ 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 -%if "%{profile}" == "tv" -%attr(644,root,root) %{_libdir}/udev/rules.d/99-wifiusb-dev.rules -%endif +%license LICENSE %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 +%post profile_tv +mv %{_libdir}/systemd/system/net-config.service.tv %{_libdir}/systemd/system/net-config.service +%if "%{?_lib}" == "lib64" +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,root,root) %{_libdir}/systemd/system/net-config.service.tv +%if "%{?_lib}" == "lib64" +%attr(644,root,root) %{_unitdir}/net-config.service.tv +%endif + +%files plugin-headed +%manifest net-config.manifest +%attr(500,root,root) %{_libdir}/net-config-plugin-headed.so