From f659561f94ad648ba35de51140ff540b2a8da032 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Tue, 4 Oct 2016 14:41:58 +0200 Subject: [PATCH] tizen: Reformat subpackages specs files to align master one To avoid confusion, of configuration flags, each configuration change is welcome to be done in all spec files at once. Change-Id: I4a35d7129719c8bfa29455f41624e1231158c62d Origin: https://gerrit.iotivity.org/gerrit/#/c/12773/ Signed-off-by: Philippe Coval Reviewed-on: https://gerrit.iotivity.org/gerrit/12773 Tested-by: jenkins-iotivity Reviewed-by: Jaehong Jo --- .../build/tizen/packaging/com.oic.ca.spec | 40 ++++++++++++++----- .../packaging/com.oic.ri.sample.spec | 43 +++++++++++++++++---- .../samples/tizen/build/packaging/com.oic.ri.spec | 45 +++++++++++++++++----- .../packaging/com.oic.es.sample.spec | 44 +++++++++++++++------ tools/tizen/iotivity.spec | 5 ++- 5 files changed, 136 insertions(+), 41 deletions(-) diff --git a/resource/csdk/connectivity/build/tizen/packaging/com.oic.ca.spec b/resource/csdk/connectivity/build/tizen/packaging/com.oic.ca.spec index 222cd4e..f0bee17 100644 --- a/resource/csdk/connectivity/build/tizen/packaging/com.oic.ca.spec +++ b/resource/csdk/connectivity/build/tizen/packaging/com.oic.ca.spec @@ -2,17 +2,33 @@ %define ROOTDIR %{_builddir}/%{name}-%{version} %define DEST_INC_DIR %{buildroot}/%{_includedir}/OICHeaders %define DEST_LIB_DIR %{buildroot}/%{_libdir} -%{!?VERBOSE: %define VERBOSE 1} - Name: com-oic-ca Version: 1.2.0 Release: 0 Summary: Tizen oicca application -URL: http://slp-source.sec.samsung.net -Source: %{name}-%{version}.tar.gz +Group: Network & Connectivity / IoT Connectivity License: Apache-2.0 -Group: Applications/OIC +URL: https://www.iotivity.org/ +Source0: http://mirrors.kernel.org/%{name}/%{version}/%{name}-%{version}.tar.gz + +%define JOB "-j4" +%if 0%{?speedpython} +%define JOB %{?_smp_mflags} +%endif +%if 0%{?speedpython:1} && 0%{?en_speedpython:1} +%en_speedpython +%endif + +# Default values to be eventually overiden BEFORE or as gbs params: +%{!?LOGGING: %define LOGGING 1} +%{!?RELEASE: %define RELEASE 1} +%{!?SECURED: %define SECURED 0} +%{!?TARGET_OS: %define TARGET_OS tizen} +%{!?TARGET_TRANSPORT: %define TARGET_TRANSPORT IP} +%{!?VERBOSE: %define VERBOSE 1} +%{!?WITH_TCP: %define WITH_TCP 0} + BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(capi-network-wifi) @@ -29,15 +45,19 @@ BuildRequires: pkgconfig(uuid) SLP oicca application %prep - %setup -q %build +scons %{JOB} \ + LOGGING=%{LOGGING} \ + RELEASE=%{RELEASE} \ + SECURED=%{SECURED} \ + TARGET_OS=%{TARGET_OS} \ + TARGET_TRANSPORT=%{TARGET_TRANSPORT} \ + VERBOSE=%{VERBOSE} \ + WITH_TCP=%{WITH_TCP} \ + #eol -echo %{ROOTDIR} - -scons TARGET_OS=tizen -c -scons VERBOSE=%{VERBOSE} TARGET_OS=tizen TARGET_TRANSPORT=%{TARGET_TRANSPORT} SECURED=%{SECURED} RELEASE=%{RELEASE} LOGGING=%{LOGGING} WITH_TCP=%{WITH_TCP} %install mkdir -p %{DEST_INC_DIR} diff --git a/resource/csdk/stack/samples/tizen/SimpleClientServer/packaging/com.oic.ri.sample.spec b/resource/csdk/stack/samples/tizen/SimpleClientServer/packaging/com.oic.ri.sample.spec index e3c14c1..e2e0b2d 100644 --- a/resource/csdk/stack/samples/tizen/SimpleClientServer/packaging/com.oic.ri.sample.spec +++ b/resource/csdk/stack/samples/tizen/SimpleClientServer/packaging/com.oic.ri.sample.spec @@ -1,15 +1,35 @@ %define PREFIX /usr/apps/com.oic.ri.sample %define ROOTDIR %{_builddir}/%{name}-%{version} -%{!?VERBOSE: %define VERBOSE 1} Name: com-oic-ri-sample Version: 1.2.0 Release: 0 Summary: Tizen adapter interfacesample application -URL: http://slp-source.sec.samsung.net -Source: %{name}-%{version}.tar.gz +Group: Network & Connectivity / IoT Connectivity License: Apache-2.0 -Group: Applications/OICSample +URL: https://www.iotivity.org/ +Source0: http://mirrors.kernel.org/%{name}/%{version}/%{name}-%{version}.tar.gz + +%define JOB "-j4" +%if 0%{?speedpython} +%define JOB %{?_smp_mflags} +%endif +%if 0%{?speedpython:1} && 0%{?en_speedpython:1} +%en_speedpython +%endif + +# Default values to be eventually overiden BEFORE or as gbs params: +%{!?LOGGING: %define LOGGING 1} +%{!?RELEASE: %define RELEASE 1} +%{!?ROUTING: %define ROUTING EP} +%{!?SECURED: %define SECURED 0} +%{!?TARGET_OS: %define TARGET_OS tizen} +%{!?TARGET_TRANSPORT: %define TARGET_TRANSPORT IP} +%{!?VERBOSE: %define VERBOSE 1} +%{!?WITH_MQ: %define WITH_MQ OFF} +%{!?WITH_PROXY: %define WITH_PROXY 0} +%{!?WITH_TCP: %define WITH_TCP 0} + BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(uuid) @@ -30,9 +50,17 @@ OIC RIsample application %setup -q %build - -scons TARGET_OS=tizen -c -scons TARGET_OS=tizen TARGET_TRANSPORT=%{TARGET_TRANSPORT} SECURED=%{SECURED} RELEASE=%{RELEASE} ROUTING=%{ROUTING} WITH_TCP=%{WITH_TCP} WITH_PROXY=%{WITH_PROXY} WITH_MQ=%{WITH_MQ} +scons %{JOB} \ + RELEASE=%{RELEASE} \ + ROUTING=%{ROUTING} \ + SECURED=%{SECURED} \ + TARGET_OS=%{TARGET_OS} \ + TARGET_TRANSPORT=%{TARGET_TRANSPORT} \ + VERBOSE=%{VERBOSE} \ + WITH_MQ=%{WITH_MQ} \ + WITH_PROXY=%{WITH_PROXY} \ + WITH_TCP=%{WITH_TCP} \ + #eol %install @@ -55,3 +83,4 @@ cp -rf %{ROOTDIR}/scons/ocrouting %{buildroot}/usr/apps/com.oic.ri.sample/bin/ /%{_datadir}/packages/com.oic.ri.sample.xml + diff --git a/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec b/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec index ffc7e42..e811da9 100644 --- a/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec +++ b/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec @@ -1,17 +1,37 @@ + %define PREFIX /usr/apps/com.oic.ri %define ROOTDIR %{_builddir}/%{name}-%{version} %define DEST_INC_DIR %{buildroot}/%{_includedir}/OICHeaders %define DEST_LIB_DIR %{buildroot}/%{_libdir} -%{!?VERBOSE: %define VERBOSE 1} Name: com-oic-ri Version: 1.2.0 Release: 0 Summary: Tizen oicri application -URL: http://slp-source.sec.samsung.net -Source: %{name}-%{version}.tar.gz +Group: Network & Connectivity / IoT Connectivity License: Apache-2.0 -Group: Applications/OIC +URL: https://www.iotivity.org/ +Source0: http://mirrors.kernel.org/%{name}/%{version}/%{name}-%{version}.tar.gz + +%define JOB "-j4" +%if 0%{?speedpython} +%define JOB %{?_smp_mflags} +%endif +%if 0%{?speedpython:1} && 0%{?en_speedpython:1} +%en_speedpython +%endif + +# Default values to be eventually overiden BEFORE or as gbs params: +%{!?LOGGING: %define LOGGING 1} +%{!?RELEASE: %define RELEASE 1} +%{!?SECURED: %define SECURED 0} +%{!?TARGET_OS: %define TARGET_OS tizen} +%{!?TARGET_TRANSPORT: %define TARGET_TRANSPORT IP} +%{!?VERBOSE: %define VERBOSE 1} +%{!?WITH_MQ: %define WITH_MQ OFF} +%{!?WITH_PROXY: %define WITH_PROXY 0} +%{!?WITH_TCP: %define WITH_TCP 0} + BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(capi-network-wifi) @@ -29,15 +49,20 @@ BuildRequires: scons SLP oicri application %prep - %setup -q %build - -echo %{ROOTDIR} - -scons TARGET_OS=tizen -c -scons TARGET_OS=tizen TARGET_TRANSPORT=%{TARGET_TRANSPORT} SECURED=%{SECURED} RELEASE=%{RELEASE} LOGGING=%{LOGGING} ROUTING=%{ROUTING} WITH_TCP=%{WITH_TCP} WITH_PROXY=%{WITH_PROXY} WITH_MQ=%{WITH_MQ} +scons %{JOB} --prefix=%{_prefix} \ + LOGGING=%{LOGGING} \ + RELEASE=%{RELEASE} \ + SECURED=%{SECURED} \ + TARGET_OS=%{TARGET_OS} \ + TARGET_TRANSPORT=%{TARGET_TRANSPORT} \ + VERBOSE=%{VERBOSE} \ + WITH_MQ=%{WITH_MQ} \ + WITH_PROXY=%{WITH_PROXY} \ + WITH_TCP=%{WITH_TCP} \ + #eol %install mkdir -p %{DEST_INC_DIR} diff --git a/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/packaging/com.oic.es.sample.spec b/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/packaging/com.oic.es.sample.spec index 41d14d9..7191720 100644 --- a/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/packaging/com.oic.es.sample.spec +++ b/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/packaging/com.oic.es.sample.spec @@ -6,10 +6,29 @@ Name: com-oic-es-sample Version: 1.2.0 Release: 0 Summary: Tizen adapter interfacesample application -URL: http://slp-source.sec.samsung.net -Source: %{name}-%{version}.tar.gz +Group: Network & Connectivity / IoT Connectivity License: Apache-2.0 -Group: Applications/OICSample +URL: https://www.iotivity.org/ +Source0: http://mirrors.kernel.org/%{name}/%{version}/%{name}-%{version}.tar.gz + +%define JOB "-j4" +%if 0%{?speedpython} +%define JOB %{?_smp_mflags} +%endif +%if 0%{?speedpython:1} && 0%{?en_speedpython:1} +%en_speedpython +%endif + +# Default values to be eventually overiden BEFORE or as gbs params: +%{!?ES_TARGET_ENROLLEE: %define ES_TARGET_ENROLLEE tizen} +%{!?LOGGING: %define LOGGING 1} +%{!?RELEASE: %define RELEASE 1} +%{!?ROUTING: %define ROUTING EP} +%{!?SECURED: %define SECURED 0} +%{!?TARGET_OS: %define TARGET_OS tizen} +%{!?TARGET_TRANSPORT: %define TARGET_TRANSPORT IP} +%{!?VERBOSE: %define VERBOSE 1} + BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gio-2.0) @@ -33,13 +52,6 @@ BuildRequires: iotivity-service %define RELEASE True %endif -%{!?TARGET_TRANSPORT: %define TARGET_TRANSPORT IP} -%{!?SECURED: %define SECURED 1} -%{!?LOGGING: %define LOGGING True} -%{!?ROUTING: %define ROUTING EP} -%{!?ES_TARGET_ENROLLEE: %define ES_TARGET_ENROLLEE tizen} -%{!?VERBOSE: %define VERBOSE 1} - %description EasySetup Sample application @@ -47,8 +59,16 @@ EasySetup Sample application %setup -q %build - -scons VERBOSE=%{VERBOSE} TARGET_OS=tizen LOGGING=True TARGET_TRANSPORT=%{TARGET_TRANSPORT} SECURED=%{SECURED} RELEASE=%{RELEASE} ROUTING=%{ROUTING} ES_TARGET_ENROLLEE=%{ES_TARGET_ENROLLEE} +scons %{JOB} --prefix=%{_prefix} \ + ES_TARGET_ENROLLEE=%{ES_TARGET_ENROLLEE} \ + LOGGING=%{LOGGING} \ + RELEASE=%{RELEASE} \ + ROUTING=%{ROUTING} \ + SECURED=%{SECURED} \ + TARGET_OS=%{TARGET_OS} \ + TARGET_TRANSPORT=%{TARGET_TRANSPORT} \ + VERBOSE=%{VERBOSE} \ + #eol %install diff --git a/tools/tizen/iotivity.spec b/tools/tizen/iotivity.spec index 34c2c00..8c9f1a0 100644 --- a/tools/tizen/iotivity.spec +++ b/tools/tizen/iotivity.spec @@ -2,10 +2,10 @@ Name: iotivity Version: 1.2.0 Release: 0 Summary: IoT Connectivity sponsored by the OCF -Group: Network & Connectivity/Other +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: %{name}-%{version}.tar.bz2 +Source0: http://mirrors.kernel.org/%{name}/%{version}/%{name}-%{version}.tar.gz Source1001: %{name}.manifest Source1002: %{name}-test.manifest @@ -61,6 +61,7 @@ Source1002: %{name}-test.manifest # Default values to be eventually overiden BEFORE or as gbs params: %{!?ES_TARGET_ENROLLEE: %define ES_TARGET_ENROLLEE tizen} %{!?LOGGING: %define LOGGING 1} +%{!?RELEASE: %define RELEASE 1} %{!?ROUTING: %define ROUTING EP} %{!?SECURED: %define SECURED 0} %{!?TARGET_ARCH: %define TARGET_ARCH %{_arch}} -- 2.7.4