Merge branch 'tizen_2.0'

Copy p2p_supplicant License file at correct location

Change-Id: I4b527d170739d6e73528d7fc5557c37b16068008

diff --cc packaging/wifi-direct-manager.spec
index 098d4c9,8c9b4a1..b31e914
--- 1/packaging/wifi-direct-manager.spec
--- 2/packaging/wifi-direct-manager.spec
+++ b/packaging/wifi-direct-manager.spec
@@@ -49,8 -49,8 +49,9 @@@ rm -rf %{buildroot
  %__strip %{buildroot}%{_bindir}/wfd-manager
  
  mkdir -p %{buildroot}/usr/share/license
--cp %{_builddir}/%{buildsubdir}/LICENSE %{buildroot}/usr/share/license/%{name}
--cp %{_builddir}/%{buildsubdir}/LICENSE %{buildroot}/usr/share/license/wifi-direct-plugin-wpasupplicant
++cp %{_builddir}/%{buildsubdir}/LICENSE.APLv2 %{buildroot}/usr/share/license/%{name}
++cp %{_builddir}/%{buildsubdir}/LICENSE.APLv2 %{buildroot}/usr/share/license/wifi-direct-plugin-wpasupplicant
++cp %{_builddir}/%{buildsubdir}/LICENSE.Flora %{buildroot}/usr/share/license/p2p_supplicant
  
  %post
  chmod 644 /usr/etc/wifi-direct/dhcpd.p2p.conf
@@@ -93,5 -93,5 +94,6 @@@ vconftool set -t string memory/private/
  %defattr(-,root,root,-)
  %{_libdir}/wifi-direct-plugin-wpasupplicant.so
  /usr/share/license/wifi-direct-plugin-wpasupplicant
++/usr/share/license/p2p_supplicant
  %attr(755,-,-) %{_sbindir}/p2p_supplicant
  

diff --cc plugin/wpasupplicant/src/wifi-direct-plugin.c
index 829c335,4acb234..d05ee09
--- 1/plugin/wpasupplicant/src/wifi-direct-plugin.c
--- 2/plugin/wpasupplicant/src/wifi-direct-plugin.c
+++ b/plugin/wpasupplicant/src/wifi-direct-plugin.c
@@@ -51,7 -51,7 +51,7 @@@ GList *g_conn_peer_addr
  static unsigned char g_assoc_sta_mac[6];
  static unsigned char g_disassoc_sta_mac[6];
  char g_wps_pin[9];
- int g_current_conn_direction;
 -static nt g_pin_event_block;
++static int g_pin_event_block;
  
  enum current_conn_direction
  {