From: Philippe Coval Date: Thu, 6 Oct 2016 11:39:13 +0000 (+0200) Subject: tizen: Simplify missing license macro for Tizen:2.3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=708df4ac6481a8977117a3b06eacdf2ef2e14942;p=contrib%2Fiotivity.git tizen: Simplify missing license macro for Tizen:2.3 Change-Id: I6c2ceec4f37589db6c110a0f04df501c689a3fde Origin: https://gerrit.iotivity.org/gerrit/#/c/12897/ Signed-off-by: Philippe Coval Reviewed-on: https://gerrit.iotivity.org/gerrit/12897 Tested-by: jenkins-iotivity Reviewed-by: Uze Choi (cherry picked from commit 0d1a98d360977b8d967129282ff8644f363c5e79) Reviewed-on: https://gerrit.iotivity.org/gerrit/13513 --- diff --git a/tools/tizen/iotivity.spec b/tools/tizen/iotivity.spec index ebd208e..ea9dc1e 100644 --- a/tools/tizen/iotivity.spec +++ b/tools/tizen/iotivity.spec @@ -46,6 +46,10 @@ Source1002: %{name}-test.manifest %define ex_install_dir %{buildroot}%{_bindir} +%if ! %{?license:0} +%define license %doc +%endif + # Default values to be eventually overiden BEFORE or as gbs params: %{!?ES_TARGET_ENROLLEE: %define ES_TARGET_ENROLLEE tizen} %{!?LOGGING: %define LOGGING 1} @@ -229,15 +233,6 @@ cp ./resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.dat %endif - -%if 0%{?tizen_version_major} < 3 -mkdir -p %{buildroot}/%{_datadir}/license -cp LICENSE %{buildroot}/%{_datadir}/license/%{name} -cp LICENSE %{buildroot}/%{_datadir}/license/%{name}-devel -cp LICENSE %{buildroot}/%{_datadir}/license/%{name}-service -cp LICENSE %{buildroot}/%{_datadir}/license/%{name}-test -%endif - cp resource/c_common/*.h %{buildroot}%{_includedir} cp resource/csdk/stack/include/*.h %{buildroot}%{_includedir} cp resource/csdk/logger/include/*.h %{buildroot}%{_includedir} @@ -261,20 +256,17 @@ rm -rfv out %{buildroot}/out %{buildroot}/${HOME} ||: %files %manifest %{name}.manifest %defattr(-,root,root,-) +%license LICENSE %{_libdir}/liboc.so %{_libdir}/liboc_logger.so %{_libdir}/liboc_logger_core.so %{_libdir}/liboctbstack.so %{_libdir}/libconnectivity_abstraction.so -%if 0%{?tizen_version_major} < 3 -%{_datadir}/license/%{name} -%else -%license LICENSE -%endif %files service %manifest %{name}.manifest %defattr(-,root,root,-) +%license LICENSE %{_libdir}/libBMISensorBundle.so %{_libdir}/libDISensorBundle.so %{_libdir}/libTGMSDKLibrary.so @@ -297,21 +289,12 @@ rm -rfv out %{buildroot}/out %{buildroot}/${HOME} ||: %else %{_libdir}/libresource_hosting.so %endif -%if 0%{?tizen_version_major} < 3 -%{_datadir}/license/%{name}-service -%else -%license LICENSE -%endif %files test %manifest %{name}-test.manifest %defattr(-,root,root,-) -%{_bindir}/* -%if 0%{?tizen_version_major} < 3 -%{_datadir}/license/%{name}-test -%else %license LICENSE -%endif +%{_bindir}/* %files devel %defattr(-,root,root,-)