X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=tools%2Ftizen%2Fiotivity.spec;h=d3ef7d3a7b36f28aa873f46b3e09a7671b4b62d6;hb=23305f902955c904b9a2a8fa128b4d8f9e24ea33;hp=1d35ddfe4cbe4006f770358c9efbf6ec8224056f;hpb=6848338aebbe9c639e4e2bb01065e5ccff34092b;p=platform%2Fupstream%2Fiotivity.git

diff --git a/tools/tizen/iotivity.spec b/tools/tizen/iotivity.spec
old mode 100644
new mode 100755
index 1d35ddf..d3ef7d3
--- a/tools/tizen/iotivity.spec
+++ b/tools/tizen/iotivity.spec
@@ -1,5 +1,5 @@
 Name: iotivity
-Version: 0.9.2
+Version: 1.0.0
 Release: 0
 Summary: IoTivity Base Stack & IoTivity Services
 Group: System Environment/Libraries
@@ -8,7 +8,7 @@ URL: https://www.iotivity.org/
 Source0: %{name}-%{version}.tar.bz2
 Source1001: %{name}.manifest
 Source1002: %{name}-test.manifest
-BuildRequires:	gettext, expat-devel
+BuildRequires:	gettext
 BuildRequires:	python, libcurl-devel
 BuildRequires:	scons
 BuildRequires:	openssl-devel
@@ -21,11 +21,15 @@ BuildRequires:  pkgconfig(uuid)
 BuildRequires:  pkgconfig(capi-network-wifi)
 BuildRequires:  pkgconfig(capi-network-bluetooth)
 BuildRequires:  pkgconfig(capi-appfw-app-common)
+BuildRequires:  pkgconfig(glib-2.0)
 Requires(postun): /sbin/ldconfig
 Requires(post): /sbin/ldconfig
 
 %define release_mode false
 %define secure_mode 0
+%define es_target_enrollee tizen
+%define es_role enrollee
+%define softap_mode ENROLLEE_SOFTAP 
 
 %description
 IoTivity Base (RICH & LITE) Stack & IoTivity Services
@@ -87,7 +91,7 @@ cp %{SOURCE1001} ./%{name}-test.manifest
 %endif
 
 
-scons -j 4 TARGET_OS=tizen TARGET_ARCH=%{RPM_ARCH} TARGET_TRANSPORT=IP RELEASE=%{release_mode} SECURED=%{secure_mode}
+scons -j 4 TARGET_OS=tizen TARGET_ARCH=%{RPM_ARCH} TARGET_TRANSPORT=IP RELEASE=%{release_mode} SECURED=%{secure_mode} ES_TARGET_ENROLLEE=%{es_target_enrollee} ES_ROLE=%{es_role} ES_SOFTAP_MODE=%{softap_mode}
 
 %install
 rm -rf %{buildroot}
@@ -121,10 +125,11 @@ cp out/tizen/*/%{build_mode}/resource/examples/simpleclientserver %{buildroot}%{
 cp out/tizen/*/%{build_mode}/resource/examples/simpleserver %{buildroot}%{_bindir}
 cp out/tizen/*/%{build_mode}/resource/examples/simpleserverHQ %{buildroot}%{_bindir}
 cp out/tizen/*/%{build_mode}/resource/examples/threadingsample %{buildroot}%{_bindir}
-
+if echo %{secure_mode}|grep -qi '1'; then
+	cp out/tizen/*/%{build_mode}/libocpmapi.a %{buildroot}%{_libdir}
+fi
+cp out/tizen/*/%{build_mode}/libcoap.a %{buildroot}%{_libdir}
 cp out/tizen/*/%{build_mode}/lib*.so %{buildroot}%{_libdir}
-cp out/tizen/*/%{build_mode}/libSSMSDK.a %{buildroot}%{_libdir}
-cp out/tizen/*/%{build_mode}/libppm.a %{buildroot}%{_libdir}
 
 cp resource/csdk/stack/include/*.h %{buildroot}%{_includedir}
 cp resource/csdk/logger/include/*.h %{buildroot}%{_includedir}
@@ -132,10 +137,13 @@ cp resource/csdk/ocrandom/include/*.h %{buildroot}%{_includedir}
 cp -r resource/oc_logger/include/* %{buildroot}%{_includedir}
 cp resource/include/*.h %{buildroot}%{_includedir}
 
+cp resource/c_common/*.h %{buildroot}%{_includedir}
+
 cp service/things-manager/sdk/inc/*.h %{buildroot}%{_includedir}
-cp service/soft-sensor-manager/SDK/cpp/include/*.h %{buildroot}%{_includedir}
-cp service/protocol-plugin/plugin-manager/src/*.h %{buildroot}%{_includedir}
+cp service/easy-setup/inc/*.h %{buildroot}%{_includedir}
+cp service/easy-setup/enrollee/inc/*.h %{buildroot}%{_includedir}
 
+cp service/things-manager/sdk/inc/*.h %{buildroot}%{_includedir}
 
 %post -p /sbin/ldconfig
 
@@ -149,24 +157,21 @@ cp service/protocol-plugin/plugin-manager/src/*.h %{buildroot}%{_includedir}
 %{_libdir}/liboc_logger_core.so
 %{_libdir}/liboctbstack.so
 %{_libdir}/libconnectivity_abstraction.so
+%{_libdir}/lib*.a
 
 %files service
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-%{_libdir}/libBMISensor.so
 %{_libdir}/libBMISensorBundle.so
 %{_libdir}/libDISensorBundle.so
-%{_libdir}/libDiscomfortIndexSensor.so
-%{_libdir}/libmosquittopp.so
-%{_libdir}/libpmimpl.so
-%{_libdir}/libSSMCore.so
-%{_libdir}/libNotificationManager.so
+%{_libdir}/libresource_hosting.so
 %{_libdir}/libTGMSDKLibrary.so
 %{_libdir}/libHueBundle.so
 %{_libdir}/librcs_client.so
 %{_libdir}/librcs_common.so
 %{_libdir}/librcs_container.so
 %{_libdir}/librcs_server.so
+%{_libdir}/libESEnrolleeSDK.so
 
 %files test
 %manifest %{name}-test.manifest
@@ -193,5 +198,4 @@ cp service/protocol-plugin/plugin-manager/src/*.h %{buildroot}%{_includedir}
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/lib*.a
 %{_includedir}/*