Merge branch 'upstream' into tizen

Conflicts:
	packaging/iotivity.spec

Change-Id: I0ebb075dbed68e747ac78ebfc36ef2ffb2b5a24a

diff --cc iotivity.pc.in
index 382cbc661217f0c5c8dc604356f215d1c4da049e,59bd6b571c13de8f91e6b500d56798ee9e32bfc7..e98ed1b5169ea595fd47a0b21735effc2a59e537
--- 1/iotivity.pc.in
--- 2/iotivity.pc.in
+++ b/iotivity.pc.in
@@@ -11,8 -11,7 +11,7 @@@ Description: IoTivity is an open sourc
  Version: @VERSION@
  URL: https://www.iotivity.org
  Requires:
- Libs: -L${libdir} -loc -loc_logger -loc_logger_core -loctbstack -lconnectivity_abstraction \
-                       @OCPMAPI_LIB@
 -Libs: -L${libdir} -loc -loc_logger -loc_logger_core -loctbstack -lconnectivity_abstraction
++Libs: -L${libdir} -loc -loc_logger -loc_logger_core -loctbstack -lconnectivity_abstraction -locpmapi
  Cflags: -I${includedir}/resource \
                        -I${svcincludedir}/resource-encapsulation \
                        -I${svcincludedir}/resource-container \

diff --cc packaging/iotivity.spec
index 67fd1e27c80a3594eb08c765f26ed214add636d2,0000000000000000000000000000000000000000..566761f52f13387318e3589fa796d4d9d9c4d82d
mode 100644,000000..100644
--- 1/packaging/iotivity.spec
--- /dev/null
+++ b/packaging/iotivity.spec
@@@ -1,228 -1,0 +1,234 @@@
- Version: 1.1.0
 +Name: iotivity
- #VERBOSE=1
++Version: 1.1.1
 +Release: 0
 +Summary: IoT Connectivity sponsored by the OIC
 +Group: Network & Connectivity/Other
 +License: Apache-2.0
 +URL: https://www.iotivity.org/
 +Source0: %{name}-%{version}.tar.bz2
 +Source1001: %{name}.manifest
 +Source1002: %{name}-test.manifest
 +BuildRequires:  gettext-tools, expat-devel
 +BuildRequires:  python, libcurl-devel
 +BuildRequires:  scons
 +BuildRequires:  boost-devel
 +BuildRequires:  pkgconfig(dlog)
 +BuildRequires:  pkgconfig(uuid)
 +BuildRequires:  pkgconfig(capi-network-wifi)
 +BuildRequires:  pkgconfig(capi-network-bluetooth)
 +BuildRequires:  pkgconfig(glib-2.0)
 +BuildRequires:  pkgconfig(sqlite3)
 +Requires(postun): /sbin/ldconfig
 +Requires(post): /sbin/ldconfig
 +
 +
 +## If tizen 2.x, RELEASE follows tizen_build_binary_release_type_eng. ##
 +## and if tizen 3.0, RELEASE follows tizen_build_devel_mode. ##
 +%if 0%{?tizen_build_devel_mode} == 1 || 0%{?tizen_build_binary_release_type_eng} == 1
 +%define RELEASE False
 +%else
 +%define RELEASE True
 +%endif
 +
 +%{!?TARGET_TRANSPORT: %define TARGET_TRANSPORT IP}
 +%{!?LOGGING: %define LOGGING True}
 +%{!?ROUTING: %define ROUTING GW}
 +%{!?ES_TARGET_ENROLLEE: %define ES_TARGET_ENROLLEE tizen}
 +%{!?ES_ROLE: %define ES_ROLE enrollee}
 +%{!?ES_SOFTAP_MODE: %define ES_SOFTAP_MODE MEDIATOR_SOFTAP}
++%{!?VERBOSE: %define VERBOSE 0}
 +
 +%description
 +An open source reference implementation of the OIC standard specifications
 +IoTivity Base Libraries are included.
 +
 +
 +%package service
 +Summary: Development files for %{name}
 +Group: Network & Connectivity/Service
 +Requires: %{name} = %{version}-%{release}
 +
 +%description service
 +The %{name}-service package contains service libraries files for
 +developing applications that use %{name}-service.
 +
 +%package test
 +Summary: Development files for %{name}
 +Group: Network & Connectivity/Testing
 +Requires: %{name} = %{version}-%{release}
 +
 +%description test
 +The %{name}-test package contains example files to show
 +how the iotivity works using %{name}-test
 +
 +%package devel
 +Summary: Development files for %{name}
 +Group: Network & Connectivity/Development
 +Requires: %{name} = %{version}-%{release}
 +Requires: pkgconfig
 +
 +%description devel
 +The %{name}-devel package contains libraries and header files for
 +developing applications that use %{name}.
 +
 +%prep
 +%setup -q
 +chmod g-w %_sourcedir/*
 +
 +cp LICENSE.md LICENSE.APLv2
 +cp %{SOURCE1001} .
 +%if 0%{?tizen_version_major} < 3
 +cp %{SOURCE1002} .
 +%else
 +cp %{SOURCE1001} ./%{name}-test.manifest
 +%endif
 +
 +%build
 +%define RPM_ARCH %{_arch}
 +
 +%ifarch armv7l armv7hl armv7nhl armv7tnhl armv7thl
 +%define RPM_ARCH "armeabi-v7a"
 +%endif
 +
 +%ifarch aarch64
 +%define RPM_ARCH "arm64"
 +%endif
 +
 +%ifarch x86_64
 +%define RPM_ARCH "x86_64"
 +%endif
 +
 +%ifarch %{ix86}
 +%define RPM_ARCH "x86"
 +%endif
 +
 +scons -j2 --prefix=%{_prefix} \
++      VERBOSE=%{VERBOSE} \
 +      TARGET_OS=tizen TARGET_ARCH=%{RPM_ARCH} TARGET_TRANSPORT=%{TARGET_TRANSPORT} \
 +      RELEASE=%{RELEASE} SECURED=1 LOGGING=%{LOGGING} ROUTING=%{ROUTING} \
 +      ES_TARGET_ENROLLEE=%{ES_TARGET_ENROLLEE} ES_ROLE=%{ES_ROLE} ES_SOFTAP_MODE=%{ES_SOFTAP_MODE} \
 +      LIB_INSTALL_DIR=%{_libdir}
 +
 +
 +%install
 +rm -rf %{buildroot}
 +CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
 +scons install --install-sandbox=%{buildroot} --prefix=%{_prefix} \
 +      TARGET_OS=tizen TARGET_ARCH=%{RPM_ARCH} TARGET_TRANSPORT=%{TARGET_TRANSPORT} \
 +      RELEASE=%{RELEASE} SECURED=1 LOGGING=%{LOGGING} ROUTING=%{ROUTING} \
 +      ES_TARGET_ENROLLEE=%{ES_TARGET_ENROLLEE} ES_ROLE=%{ES_ROLE} ES_SOFTAP_MODE=%{ES_SOFTAP_MODE} \
 +      LIB_INSTALL_DIR=%{_libdir}
 +
 +
 +# For Example
 +%if %{RELEASE} == "True"
 +%define build_mode release
 +%else
 +%define build_mode debug
 +%endif
 +%define ex_install_dir %{buildroot}%{_bindir}
 +mkdir -p %{ex_install_dir}
 +cp out/tizen/*/%{build_mode}/examples/OICMiddle/OICMiddle %{ex_install_dir}
 +cp out/tizen/*/%{build_mode}/resource/examples/devicediscoveryclient %{ex_install_dir}
 +cp out/tizen/*/%{build_mode}/resource/examples/devicediscoveryserver %{ex_install_dir}
 +cp out/tizen/*/%{build_mode}/resource/examples/fridgeclient %{ex_install_dir}
 +cp out/tizen/*/%{build_mode}/resource/examples/fridgeserver %{ex_install_dir}
 +cp out/tizen/*/%{build_mode}/resource/examples/garageclient %{ex_install_dir}
 +cp out/tizen/*/%{build_mode}/resource/examples/garageserver %{ex_install_dir}
 +cp out/tizen/*/%{build_mode}/resource/examples/groupclient %{ex_install_dir}
 +cp out/tizen/*/%{build_mode}/resource/examples/groupserver %{ex_install_dir}
 +cp out/tizen/*/%{build_mode}/resource/examples/lightserver %{ex_install_dir}
 +cp out/tizen/*/%{build_mode}/resource/examples/presenceclient %{ex_install_dir}
 +cp out/tizen/*/%{build_mode}/resource/examples/presenceserver %{ex_install_dir}
 +cp out/tizen/*/%{build_mode}/resource/examples/roomclient %{ex_install_dir}
 +cp out/tizen/*/%{build_mode}/resource/examples/roomserver %{ex_install_dir}
 +cp out/tizen/*/%{build_mode}/resource/examples/simpleclient %{ex_install_dir}
 +cp out/tizen/*/%{build_mode}/resource/examples/simpleclientHQ %{ex_install_dir}
 +cp out/tizen/*/%{build_mode}/resource/examples/simpleclientserver %{ex_install_dir}
 +cp out/tizen/*/%{build_mode}/resource/examples/simpleserver %{ex_install_dir}
 +cp out/tizen/*/%{build_mode}/resource/examples/simpleserverHQ %{ex_install_dir}
 +cp out/tizen/*/%{build_mode}/resource/examples/threadingsample %{ex_install_dir}
 +cp out/tizen/*/%{build_mode}/resource/examples/oic_svr_db_server.dat %{ex_install_dir}
 +cp out/tizen/*/%{build_mode}/resource/examples/oic_svr_db_client.dat %{ex_install_dir}
 +mkdir -p %{ex_install_dir}/provisioning
 +cp out/tizen/*/%{build_mode}/resource/csdk/security/provisioning/sample/provisioningclient %{ex_install_dir}/provisioning/
 +cp out/tizen/*/%{build_mode}/resource/csdk/security/provisioning/sample/oic_svr_db_client.dat %{ex_install_dir}/provisioning/
++cp out/tizen/*/%{build_mode}/resource/csdk/security/provisioning/sample/sampleserver_justworks %{ex_install_dir}/provisioning/
++cp out/tizen/*/%{build_mode}/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.dat %{ex_install_dir}/provisioning/
++cp out/tizen/*/%{build_mode}/resource/csdk/security/provisioning/sample/sampleserver_randompin %{ex_install_dir}/provisioning/
++cp out/tizen/*/%{build_mode}/resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.dat %{ex_install_dir}/provisioning/
 +
 +cp ./resource/csdk/security/include/pinoxmcommon.h %{buildroot}%{_includedir}
 +cp ./resource/csdk/security/include/securevirtualresourcetypes.h %{buildroot}%{_includedir}
 +cp ./resource/csdk/security/provisioning/include/oxm/*.h %{buildroot}%{_includedir}
 +cp ./resource/csdk/security/provisioning/include/internal/*.h %{buildroot}%{_includedir}
 +cp ./resource/csdk/security/provisioning/include/*.h %{buildroot}%{_includedir}
 +cp ./resource/csdk/connectivity/api/casecurityinterface.h %{buildroot}%{_includedir}
 +cp ./resource/csdk/connectivity/api/cacommon.h %{buildroot}%{_includedir}
 +
 +%if 0%{?tizen_version_major} < 3
 +mkdir -p %{buildroot}/%{_datadir}/license
 +cp LICENSE.APLv2 %{buildroot}/%{_datadir}/license/%{name}
 +cp LICENSE.APLv2 %{buildroot}/%{_datadir}/license/%{name}-service
 +cp LICENSE.APLv2 %{buildroot}/%{_datadir}/license/%{name}-test
 +%endif
 +
++cp service/things-manager/sdk/inc/*.h %{buildroot}%{_includedir}
 +cp service/easy-setup/inc/*.h %{buildroot}%{_includedir}
 +cp service/easy-setup/enrollee/inc/*.h %{buildroot}%{_includedir}
 +
 +
 +%post -p /sbin/ldconfig
 +
 +%postun -p /sbin/ldconfig
 +
 +%files
 +%manifest %{name}.manifest
 +%defattr(-,root,root,-)
 +%{_libdir}/liboc.so
 +%{_libdir}/liboc_logger.so
 +%{_libdir}/liboc_logger_core.so
 +%{_libdir}/liboctbstack.so
 +%{_libdir}/libconnectivity_abstraction.so
 +%{_libdir}/libocpmapi.so
 +%{_libdir}/libocprovision.so
 +%if 0%{?tizen_version_major} < 3
 +%{_datadir}/license/%{name}
 +%else
 +%license LICENSE.APLv2
 +%endif
 +
 +%files service
 +%manifest %{name}.manifest
 +%defattr(-,root,root,-)
 +%{_libdir}/libBMISensorBundle.so
 +%{_libdir}/libDISensorBundle.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
 +%if 0%{?tizen_version_major} < 3
 +%{_datadir}/license/%{name}-service
 +%else
 +%license LICENSE.APLv2
 +%endif
 +
 +%files test
 +%manifest %{name}-test.manifest
 +%defattr(-,root,root,-)
 +%{_bindir}/*
 +%if 0%{?tizen_version_major} < 3
 +%{_datadir}/license/%{name}-test
 +%else
 +%license LICENSE.APLv2
 +%endif
 +
 +%files devel
 +%defattr(-,root,root,-)
 +%{_libdir}/lib*.a
 +%{_libdir}/pkgconfig/%{name}.pc
 +%{_includedir}/*

diff --cc resource/csdk/connectivity/api/cacommon.h
Simple merge

diff --cc resource/csdk/stack/include/ocstackconfig.h
Simple merge

diff --cc resource/csdk/stack/test/stacktests.cpp
Simple merge