From 03efee8b33c69f46a42ddcd20adcb360ad4f6d8b Mon Sep 17 00:00:00 2001
From: Philippe Coval <philippe.coval@osg.samsung.com>
Date: Sun, 19 Nov 2017 02:08:19 +0100
Subject: [PATCH] rpm: Also support OS without manifest

This was needed for ARTIK7 on fedora-24

Change-Id: I9a5081fe78299ca57dd2fbfa4efb70b051e4ad28
Bug: https://jira.iotivity.org/browse/IOT-524
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit 924f632d0af575193899b872ecddfd0459a8f49a)
Origin: https://gerrit.iotivity.org/gerrit/#/c/23371/3
---
 tools/tizen/iotivity.spec | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/tools/tizen/iotivity.spec b/tools/tizen/iotivity.spec
index 9d27310f47..2e6df9b19f 100755
--- a/tools/tizen/iotivity.spec
+++ b/tools/tizen/iotivity.spec
@@ -6,8 +6,11 @@ Group: Network & Connectivity / IoT Connectivity
 License: Apache-2.0 and BSD-2-Clause and (MIT or BSL-1.0) and MIT
 URL: https://www.iotivity.org/
 Source0: http://mirrors.kernel.org/%{name}/%{version}/%{name}-%{version}.tar.gz
+
+%if 0%{?manifest:1}
 Source1001: %{name}.manifest
 Source1002: %{name}-test.manifest
+%endif
 
 %if 0%{?tizen:1}
 %define TARGET_OS tizen
@@ -68,10 +71,6 @@ BuildRequires: python-accel-aarch64-cross-aarch64
 %define license %doc
 %endif
 
-%if ! 0%{?manifest:0}
-%define manifest %doc
-%endif
-
 # Default values to be eventually overiden BEFORE or as gbs params:
 %{!?ES_TARGET_ENROLLEE: %define ES_TARGET_ENROLLEE %{TARGET_OS}}
 %{!?LOGGING: %define LOGGING 1}
@@ -180,12 +179,14 @@ find . \
 
 cat LICENSE
 
+%if 0%{?manifest:1}
 cp %{SOURCE1001} .
 %if 0%{?tizen_version_major} < 3
 cp %{SOURCE1002} .
 %else
 cp %{SOURCE1001} ./%{name}-test.manifest
 %endif
+%endif
 
 %build
 scons %{?_smp_mflags} --prefix=%{_prefix} \
@@ -305,7 +306,9 @@ rm -rfv out %{buildroot}/out %{buildroot}/${HOME} ||:
 %postun -p /sbin/ldconfig
 
 %files
+%if 0%{?manifest:1}
 %manifest %{name}.manifest
+%endif
 %defattr(-,root,root,-)
 %license LICENSE
 %{_libdir}/liboc.so
@@ -320,7 +323,9 @@ rm -rfv out %{buildroot}/out %{buildroot}/${HOME} ||:
 %endif
 
 %files service
+%if 0%{?manifest:1}
 %manifest %{name}.manifest
+%endif
 %defattr(-,root,root,-)
 %license LICENSE
 %{_libdir}/libBMISensorBundle.so
@@ -342,7 +347,9 @@ rm -rfv out %{buildroot}/out %{buildroot}/${HOME} ||:
 %endif
 
 %files test
+%if 0%{?manifest:1}
 %manifest %{name}-test.manifest
+%endif
 %defattr(-,root,root,-)
 %license LICENSE
 %{exlibdir}/*
-- 
GitLab