From 0c9cc9f4ed3a0cd71a0043d6327e81d07207ea3f Mon Sep 17 00:00:00 2001 From: DoHyun Pyun Date: Thu, 21 Nov 2019 12:43:38 +0900 Subject: [PATCH] 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 --- packaging/iotivity.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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} -- 2.7.4