X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fcapi-network-wifi-direct.spec;h=c02fabf6bc996dc6ccd65bacd6b2b9d8ea278665;hb=f5a9f06c6a68c448944ab7e1b3d722bde9ffeef7;hp=a6734bf7ca1a66a173634ca1d23800e0ac30b4a0;hpb=c765660a7e59799f7f5adc72fbea066cd1936144;p=platform%2Fcore%2Fapi%2Fwifi-direct.git

diff --git a/packaging/capi-network-wifi-direct.spec b/packaging/capi-network-wifi-direct.spec
index a6734bf..c02fabf 100644
--- a/packaging/capi-network-wifi-direct.spec
+++ b/packaging/capi-network-wifi-direct.spec
@@ -3,7 +3,7 @@
 
 Name:       capi-network-wifi-direct
 Summary:    Network WiFi-Direct Library
-Version:    1.2.87
+Version:    1.2.95
 Release:    1
 Group:      Network & Connectivity/API
 License:    Apache-2.0
@@ -36,26 +36,13 @@ Requires: capi-base-common-devel
 %description devel
 Network WiFi-Direct library in Tizen CAPI (Shared Library) (Development)
 
-#%package -n test-wifi-direct
-#Summary:    Test Application for Wi-Fi Direct
-#Group:      Network & Connectivity/Testing
-#Requires:   %{name} = %{version}-%{release}
-
-#%description -n test-wifi-direct
-#Test Application for Wi-Fi Direct Framework
-
-%package extension-features
-Summary:    capi-network-wifi-direct with more features (mobile/common/tv)
+%package 	tool
+Summary:    Test Application for Wi-Fi Direct
+Group:      Network & Connectivity/Testing
 Requires:   %{name} = %{version}-%{release}
-Provides:   %{name}-profile_common = %{version}-%{release}
-Provides:   %{name}-profile_mobile = %{version}-%{release}
-Provides:   %{name}-profile_tv = %{version}-%{release}
-%description extension-features
-Overwrites the binary of %{name} with a binary containing more features:
-WIFI_DIRECT_ON_DEMAND, SERVICE_DISCOVERY, WIFI_DISPLAY.
-This targets mobile/common/tv profiles.
-If you unininstall this package and want to keep %{name}, you need to
-reinstall %{name} because this package overwrites a file or %{name}.
+
+%description tool
+Test Application for Wi-Fi Direct Framework
 
 %prep
 %setup -q
@@ -78,13 +65,6 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 
-mkdir -p build_extension
-pushd build_extension
-cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-	.. -DVERSION=%{version} -DMAJORVERSION=${MAJORVER} -DCMAKE_LIB_DIR=%{_libdir}
-make %{?jobs:-j%jobs}
-popd
-
 cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
 	. -DVERSION=%{version} -DMAJORVERSION=${MAJORVER} -DCMAKE_LIB_DIR=%{_libdir}
 make %{?jobs:-j%jobs}
@@ -92,12 +72,6 @@ make %{?jobs:-j%jobs}
 %install
 rm -rf %{buildroot}
 
-pushd build_extension
-%make_install
-popd
-pushd %{buildroot}%{_libdir}
-for FILE in libwifi-direct.so.*; do mv "${FILE}" "${FILE}.extension"; done
-popd
 %make_install
 
 ln -sf libwifi-direct.so.%{version} %{buildroot}/%{_libdir}/libwifi-direct.so.0
@@ -114,15 +88,6 @@ ln -sf libwifi-direct.so.%{version} %{buildroot}/%{_libdir}/libwifi-direct.so.0
 %exclude %{_libdir}/libwifi-direct.so.*.extension
 %{_libdir}/libwifi-direct.so.*
 
-%post extension-features
-pushd %{_libdir}
-for FILE in libwifi-direct.so.*.extension;do ln -sf "${FILE}" "${FILE%.extension}"; done
-popd
-%preun extension-features
-echo "If you want to keep %{name} after uninstalling this, you need to reinstall %{name}."
-%files extension-features
-%{_libdir}/libwifi-direct.so.*.extension
-
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/capi-network-wifi-direct.pc
@@ -130,8 +95,5 @@ echo "If you want to keep %{name} after uninstalling this, you need to reinstall
 %{_includedir}/wifi-direct/wifi-direct-internal.h
 %{_libdir}/libwifi-direct.so
 
-#%files -n test-wifi-direct
-#%manifest test-wifi-direct.manifest
-#%license LICENSE
-#%defattr(-,app,app,-)
-#%attr(755,-,-) %{_bindir}/test-wifi-direct
+%files tool
+%{_bindir}/wifi_direct_test