From: DoHyun Pyun <dh79.pyun@samsung.com>
Date: Thu, 21 Nov 2019 03:43:38 +0000 (+0900)
Subject: Change the header install path for c_common and logger
X-Git-Tag: accepted/tizen/unified/20191121.073426^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=254692eaffdc086142d90d9540c835e07cb2b0ab;hp=203467c79502398f27886841f57a7576002db451;p=platform%2Fupstream%2Fiotivity.git

Change the header install path for c_common and logger

ttrace moudle installs "ttrace.h" header in /usr/include,
so conflict error is occured. To resolve this issue,
iotivity-dev changes the header install path.

[80s] [372/388] installing iotivity-devel-1.2.1-0
[80s] file /usr/include/trace.h from install of iotivity-devel-1.2.1-0.armv7l conflicts with file from package ttrace-devel-1.0.3-1.armv7l

Change-Id: I66c0395b3abce8700c8beea8e2eb4ca540e9f034
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
---

diff --git a/packaging/iotivity.spec b/packaging/iotivity.spec
index 681d0d0..1f99cae 100644
--- a/packaging/iotivity.spec
+++ b/packaging/iotivity.spec
@@ -284,14 +284,14 @@ cp resource/csdk/stack/include/*.h %{buildroot}%{_includedir}/resource
 cp resource/oc_logger/include/*.h %{buildroot}%{_includedir}/resource
 cp resource/oc_logger/include/*.hpp %{buildroot}%{_includedir}/resource
 
-cp resource/c_common/*.h %{buildroot}%{_includedir}
-cp resource/c_common/ocrandom/include/*.h %{buildroot}%{_includedir}
-cp resource/c_common/oic_string/include/*.h %{buildroot}%{_includedir}
-cp resource/c_common/oic_malloc/include/*.h %{buildroot}%{_includedir}
-cp resource/c_common/ocevent/include/*.h %{buildroot}%{_includedir}
-cp resource/c_common/octhread/include/*.h %{buildroot}%{_includedir}
-cp resource/csdk/stack/include/*.h %{buildroot}%{_includedir}
-cp resource/csdk/logger/include/*.h %{buildroot}%{_includedir}
+cp resource/c_common/*.h %{buildroot}%{_includedir}/c_common
+cp resource/c_common/ocrandom/include/*.h %{buildroot}%{_includedir}/c_common
+cp resource/c_common/oic_string/include/*.h %{buildroot}%{_includedir}/c_common
+cp resource/c_common/oic_malloc/include/*.h %{buildroot}%{_includedir}/c_common
+cp resource/c_common/ocevent/include/*.h %{buildroot}%{_includedir}/c_common
+cp resource/c_common/octhread/include/*.h %{buildroot}%{_includedir}/c_common
+cp resource/csdk/stack/include/*.h %{buildroot}%{_includedir}/c_common
+cp resource/csdk/logger/include/*.h %{buildroot}%{_includedir}/c_common
 
 cp service/easy-setup/inc/*.h %{buildroot}%{_includedir}
 cp service/easy-setup/enrollee/inc/*.h %{buildroot}%{_includedir}