Commit 03efee8b authored by Philippe Coval's avatar Philippe Coval Committed by Ziran Sun

rpm: Also support OS without manifest

This was needed for ARTIK7 on fedora-24

Change-Id: I9a5081fe78299ca57dd2fbfa4efb70b051e4ad28
Bug: https://jira.iotivity.org/browse/IOT-524Signed-off-by: default avatarPhilippe Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit 924f632d)
Origin: https://gerrit.iotivity.org/gerrit/#/c/23371/3
parent a4e14b93
...@@ -6,8 +6,11 @@ Group: Network & Connectivity / IoT Connectivity ...@@ -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 License: Apache-2.0 and BSD-2-Clause and (MIT or BSL-1.0) and MIT
URL: https://www.iotivity.org/ URL: https://www.iotivity.org/
Source0: http://mirrors.kernel.org/%{name}/%{version}/%{name}-%{version}.tar.gz Source0: http://mirrors.kernel.org/%{name}/%{version}/%{name}-%{version}.tar.gz
%if 0%{?manifest:1}
Source1001: %{name}.manifest Source1001: %{name}.manifest
Source1002: %{name}-test.manifest Source1002: %{name}-test.manifest
%endif
%if 0%{?tizen:1} %if 0%{?tizen:1}
%define TARGET_OS tizen %define TARGET_OS tizen
...@@ -68,10 +71,6 @@ BuildRequires: python-accel-aarch64-cross-aarch64 ...@@ -68,10 +71,6 @@ BuildRequires: python-accel-aarch64-cross-aarch64
%define license %doc %define license %doc
%endif %endif
%if ! 0%{?manifest:0}
%define manifest %doc
%endif
# Default values to be eventually overiden BEFORE or as gbs params: # Default values to be eventually overiden BEFORE or as gbs params:
%{!?ES_TARGET_ENROLLEE: %define ES_TARGET_ENROLLEE %{TARGET_OS}} %{!?ES_TARGET_ENROLLEE: %define ES_TARGET_ENROLLEE %{TARGET_OS}}
%{!?LOGGING: %define LOGGING 1} %{!?LOGGING: %define LOGGING 1}
...@@ -180,12 +179,14 @@ find . \ ...@@ -180,12 +179,14 @@ find . \
cat LICENSE cat LICENSE
%if 0%{?manifest:1}
cp %{SOURCE1001} . cp %{SOURCE1001} .
%if 0%{?tizen_version_major} < 3 %if 0%{?tizen_version_major} < 3
cp %{SOURCE1002} . cp %{SOURCE1002} .
%else %else
cp %{SOURCE1001} ./%{name}-test.manifest cp %{SOURCE1001} ./%{name}-test.manifest
%endif %endif
%endif
%build %build
scons %{?_smp_mflags} --prefix=%{_prefix} \ scons %{?_smp_mflags} --prefix=%{_prefix} \
...@@ -305,7 +306,9 @@ rm -rfv out %{buildroot}/out %{buildroot}/${HOME} ||: ...@@ -305,7 +306,9 @@ rm -rfv out %{buildroot}/out %{buildroot}/${HOME} ||:
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%files %files
%if 0%{?manifest:1}
%manifest %{name}.manifest %manifest %{name}.manifest
%endif
%defattr(-,root,root,-) %defattr(-,root,root,-)
%license LICENSE %license LICENSE
%{_libdir}/liboc.so %{_libdir}/liboc.so
...@@ -320,7 +323,9 @@ rm -rfv out %{buildroot}/out %{buildroot}/${HOME} ||: ...@@ -320,7 +323,9 @@ rm -rfv out %{buildroot}/out %{buildroot}/${HOME} ||:
%endif %endif
%files service %files service
%if 0%{?manifest:1}
%manifest %{name}.manifest %manifest %{name}.manifest
%endif
%defattr(-,root,root,-) %defattr(-,root,root,-)
%license LICENSE %license LICENSE
%{_libdir}/libBMISensorBundle.so %{_libdir}/libBMISensorBundle.so
...@@ -342,7 +347,9 @@ rm -rfv out %{buildroot}/out %{buildroot}/${HOME} ||: ...@@ -342,7 +347,9 @@ rm -rfv out %{buildroot}/out %{buildroot}/${HOME} ||:
%endif %endif
%files test %files test
%if 0%{?manifest:1}
%manifest %{name}-test.manifest %manifest %{name}-test.manifest
%endif
%defattr(-,root,root,-) %defattr(-,root,root,-)
%license LICENSE %license LICENSE
%{exlibdir}/* %{exlibdir}/*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment