X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fwifi-direct-manager.spec;h=3e4839b85b35528d73200d61073193707b9abb1a;hb=7f13c60e466e7ea21000fa539c7b0ed0a6f09da0;hp=142374fed6b6bc0a1589bafacd7b5ce401711592;hpb=7ffbaac0100d45213d2c62cac5d834db9ebada54;p=platform%2Fcore%2Fconnectivity%2Fwifi-direct-manager.git diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec index 142374f..3e4839b 100755 --- a/packaging/wifi-direct-manager.spec +++ b/packaging/wifi-direct-manager.spec @@ -1,10 +1,13 @@ Name: wifi-direct-manager Summary: Wi-Fi Direct manger -Version: 1.2.117 +Version: 1.2.181 Release: 1 Group: Network & Connectivity/Wireless License: Apache-2.0 Source0: %{name}-%{version}.tar.gz +Source1: dbus-wfd-manager.conf +Source2: net.wifidirect.service +Source3: wifi-direct-manager.service BuildRequires: pkgconfig(capi-network-wifi-direct) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(dlog) @@ -12,11 +15,12 @@ BuildRequires: pkgconfig(vconf) BuildRequires: pkgconfig(libnl-2.0) BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(aul) -BuildRequires: pkgconfig(cynara-client) -BuildRequires: pkgconfig(cynara-creds-socket) -BuildRequires: pkgconfig(cynara-session) BuildRequires: pkgconfig(capi-appfw-application) +BuildRequires: pkgconfig(libsystemd-login) + +BuildRequires: pkgconfig(libtzplatform-config) + BuildRequires: cmake #BuildRequires: model-build-features Requires: net-tools @@ -26,7 +30,7 @@ Requires: toybox-symlinks-dhcpd Requires: toybox-symlinks-dhcp %description -Wi-Fi Direct manager +Manager for handling wifi-direct functionalities %package -n wifi-direct-plugin-wpasupplicant Summary: Wifi direct plugin for wpa supplicant @@ -34,11 +38,18 @@ Group: Network & Connectivity/Wireless Requires: %{name} = %{version}-%{release} %description -n wifi-direct-plugin-wpasupplicant -Wifi direct plugin for wpa supplicant +Wi-Fi direct manager plugin to abstract wpa_supplicant %prep %setup -q +chmod 644 %{SOURCE0} +chmod 644 %{SOURCE1} +chmod 644 %{SOURCE2} +chmod 644 %{SOURCE3} +cp -a %{SOURCE1} ./wfd-manager.conf +cp -a %{SOURCE2} . +cp -a %{SOURCE3} . %build @@ -65,6 +76,15 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \ %if ! 0%{?model_build_feature_network_tethering_disable} -DTIZEN_TETHERING_ENABLE=0 \ %endif +%if "%{profile}" == "common" + -DTIZEN_FEATURE_SERVICE_DISCOVERY=1 \ + -DTIZEN_WLAN_CONCURRENT_ENABLE=1 \ + -DTIZEN_FEATURE_WIFI_DISPLAY=1 \ + -DTIZEN_FEATURE_IP_OVER_EAPOL=1 \ + -DCTRL_IFACE_DBUS=1 \ + -DTIZEN_DEBUG_DBUS_VALUE=1 \ + -DTIZEN_COMMON=1 \ +%else %if "%{profile}" == "wearable" -DTIZEN_FEATURE_SERVICE_DISCOVERY=0 \ -DTIZEN_FEATURE_WIFI_DISPLAY=0 \ @@ -76,25 +96,36 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \ -DTIZEN_FEATURE_SERVICE_DISCOVERY=1 \ -DTIZEN_WLAN_CONCURRENT_ENABLE=1 \ -DTIZEN_FEATURE_WIFI_DISPLAY=1 \ - -DTIZEN_FEATURE_DEFAULT_CONNECTION_AGENT=0 \ + -DTIZEN_FEATURE_DEFAULT_CONNECTION_AGENT=1 \ + -DTIZEN_FEATURE_IP_OVER_EAPOL=1 \ -DCTRL_IFACE_DBUS=1 \ + -DTIZEN_DEBUG_DBUS_VALUE=1 \ -DTIZEN_MOBILE=1 \ + -DTIZEN_FEATURE_ASP=1 \ %else %if "%{profile}" == "tv" -DTIZEN_FEATURE_SERVICE_DISCOVERY=1 \ -DTIZEN_WLAN_CONCURRENT_ENABLE=0 \ -DTIZEN_FEATURE_WIFI_DISPLAY=1 \ + -DTIZEN_FEATURE_IP_OVER_EAPOL=1 \ -DCTRL_IFACE_DBUS=1 \ + -DTIZEN_DEBUG_DBUS_VALUE=1 \ -DTIZEN_WIFI_MODULE_BUNDLE=0 \ -DTIZEN_TV=1 \ - -DTIZEN_TV_BOARD_PRD=1 \ +%endif %endif %endif %endif %if "%{?_lib}" == "lib64" -DTIZEN_ARCH_64=1 \ %endif --DCMAKE_LIB_DIR=%{_libdir} +-DLIB_DIR=%{_libdir} \ +-DBIN_DIR=%{_bindir} \ +-DSBIN_DIR=%{_sbindir} \ +-DTZ_SYS_RO_ETC=%TZ_SYS_RO_ETC \ +-DTZ_SYS_VAR=%TZ_SYS_VAR \ +-DTZ_SYS_ETC=%TZ_SYS_ETC \ +-DTZ_SYS_RUN=%TZ_SYS_RUN make %{?_smp_mflags} @@ -103,64 +134,44 @@ make %{?_smp_mflags} rm -rf %{buildroot} %make_install -#%__strip %{buildroot}%{_libdir}/wifi-direct-plugin-wpasupplicant.so -#%__strip %{buildroot}%{_bindir}/wfd-manager -#License -mkdir -p %{buildroot}%{_datadir}/license -cp %{_builddir}/%{buildsubdir}/LICENSE.APLv2 %{buildroot}%{_datadir}/license/%{name} -cp %{_builddir}/%{buildsubdir}/LICENSE.APLv2 %{buildroot}%{_datadir}/license/wifi-direct-plugin-wpasupplicant +mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d +cp wfd-manager.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/wfd-manager.conf +mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services/ +cp net.wifidirect.service %{buildroot}%{_datadir}/dbus-1/system-services/net.wifidirect.service +mkdir -p %{buildroot}%{_libdir}/systemd/system/ +cp wifi-direct-manager.service %{buildroot}%{_libdir}/systemd/system/wifi-direct-manager.service %post -#TV profile uses default XU3 device which creates wlan interface only -%if "%{profile}" == "tv" -# Comment it for temp puprose. Tizen TV Board supports p2p0 interface -#chmod 644 /usr/etc/wifi-direct/dhcpd.wlan.conf -chmod 644 /usr/etc/wifi-direct/dhcpd.p2p.conf -%else -chmod 644 /usr/etc/wifi-direct/dhcpd.p2p.conf -%endif -chmod 755 /usr/bin/dhcpd-notify.sh -chmod 755 /usr/etc/wifi-direct/udhcp_script.non-autoip -chmod 755 /usr/bin/wifi-direct-server.sh -chmod 755 /usr/bin/wifi-direct-dhcp.sh -chmod 755 /usr/sbin/p2p_supp.sh - -%if "%{profile}" == "tv" - if [ ! -d /opt/var/lib/misc ]; then - mkdir -p /opt/var/lib/misc - fi - - touch /opt/var/lib/misc/dhcpd.leases - chmod 666 /opt/var/lib/misc/dhcpd.leases -%else - if [ ! -d /var/lib/misc ]; then - mkdir -p /var/lib/misc - fi +chmod 644 %{TZ_SYS_RO_ETC}/wifi-direct/dhcpd.conf +chmod 755 %{_bindir}/dhcpd-notify.sh +chmod 755 %{TZ_SYS_RO_ETC}/wifi-direct/udhcp_script.non-autoip +chmod 755 %{_bindir}/wifi-direct-server.sh +chmod 755 %{_bindir}/wifi-direct-dhcp.sh +chmod 755 %{_sbindir}/p2p_supp.sh - touch /var/lib/misc/dhcpd.leases - chmod 666 /var/lib/misc/dhcpd.leases -%endif - -%postun +if [ ! -d %{TZ_SYS_VAR}/lib/misc ]; then + mkdir -p %{TZ_SYS_VAR}/lib/misc +fi +touch %{TZ_SYS_VAR}/lib/misc/dhcpd.leases +chmod 666 %{TZ_SYS_VAR}/lib/misc/dhcpd.leases %files %manifest wifi-direct-manager.manifest +%license LICENSE %defattr(-,root,root,-) %{_bindir}/wfd-manager -#TV profile uses default XU3 device which creates wlan interface only -%if "%{profile}" == "tv" -/usr/etc/wifi-direct/dhcpd.p2p.conf -#/usr/etc/wifi-direct/dhcpd.wlan.conf -%else -/usr/etc/wifi-direct/dhcpd.p2p.conf -%endif -/usr/etc/wifi-direct/udhcp_script.non-autoip -/usr/etc/wifi-direct/p2p_supp.conf -/opt/etc/p2p_supp.conf -/usr/etc/wifi-direct/ccode.conf -/opt/etc/persistent-peer +%config %TZ_SYS_RO_ETC/wifi-direct/ccode.conf +%config %TZ_SYS_RO_ETC/wifi-direct/dhcpd.conf +%config %TZ_SYS_RO_ETC/wifi-direct/p2p_supp.conf +%config %TZ_SYS_RO_ETC/wifi-direct/udhcp_script.non-autoip +%config %{_sysconfdir}/dbus-1/system.d/wfd-manager.conf +%TZ_SYS_RO_ETC/wifi-direct/ccode.conf +%TZ_SYS_RO_ETC/wifi-direct/dhcpd.conf +%TZ_SYS_RO_ETC/wifi-direct/p2p_supp.conf +%TZ_SYS_RO_ETC/wifi-direct/udhcp_script.non-autoip +%TZ_SYS_ETC/p2p_supp.conf %{_bindir}/dhcpd-notify.sh %{_bindir}/wifi-direct-server.sh %{_bindir}/wifi-direct-dhcp.sh @@ -168,12 +179,14 @@ chmod 755 /usr/sbin/p2p_supp.sh %attr(755,-,-) %{_bindir}/dhcpd-notify.sh %attr(755,-,-) %{_bindir}/wifi-direct-server.sh %attr(755,-,-) %{_bindir}/wifi-direct-dhcp.sh -%attr(755,-,-) /usr/etc/wifi-direct/udhcp_script.non-autoip +%attr(755,-,-) %{TZ_SYS_RO_ETC}/wifi-direct/udhcp_script.non-autoip +%attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/* +%attr(644,root,root) %{_datadir}/dbus-1/system-services/* +%attr(644,root,root) %{_libdir}/systemd/system/* %attr(755,-,-) %{_sbindir}/p2p_supp.sh -%attr(644,-,-) %{_datadir}/license/%{name} %files -n wifi-direct-plugin-wpasupplicant %manifest wifi-direct-plugin-wpasupplicant.manifest +%license LICENSE %defattr(-,root,root,-) %{_libdir}/wifi-direct-plugin-wpasupplicant.so -%attr(644,-,-) %{_datadir}/license/wifi-direct-plugin-wpasupplicant