From: Youngjae Shin Date: Sun, 27 Sep 2015 08:37:48 +0000 (+0900) Subject: fix rpm warning X-Git-Tag: submit/tizen/20151130.235229~89 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5185ca240fa6777d18cbed6fb9ce44f9e3048f74;p=platform%2Fcore%2Fiot%2Fiotcon.git fix rpm warning Change-Id: Ibe4bbf572a99cb00a730668ad67ee3e68cfb2264 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ec9cd6..f2da51b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,10 +16,10 @@ SET(OCLOGGER_CORE "oc_logger_core") SET(CA "connectivity_abstraction") SET(OCTBSTACK "octbstack") -IF(${TZ_VER} EQUAL "3") +IF(NEW_SECURE) CONFIGURE_FILE(${PROJECT_NAME}.conf.in ${PROJECT_NAME}.conf @ONLY) INSTALL(FILES ${PROJECT_NAME}.conf DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d/) -ENDIF(${TZ_VER} EQUAL "3") +ENDIF(NEW_SECURE) ADD_SUBDIRECTORY(common) ADD_SUBDIRECTORY(lib) diff --git a/common/ic-log.h b/common/ic-log.h index 72c29a1..48a4184 100644 --- a/common/ic-log.h +++ b/common/ic-log.h @@ -16,11 +16,11 @@ #ifndef __IOT_CONNECTIVITY_MANAGER_INTERNAL_LOG_H__ #define __IOT_CONNECTIVITY_MANAGER_INTERNAL_LOG_H__ -#define IC_LOG_RED "\033[0;31m" -#define IC_LOG_GREEN "\033[0;32m" -#define IC_LOG_BROWN "\033[0;33m" -#define IC_LOG_BLUE "\033[0;34m" -#define IC_LOG_END "\033[0;m" +#define IC_LOG_RED "\033[0;31m" +#define IC_LOG_GREEN "\033[0;32m" +#define IC_LOG_BROWN "\033[0;33m" +#define IC_LOG_BLUE "\033[0;34m" +#define IC_LOG_END "\033[0;m" #undef _DBG #undef _INFO diff --git a/packaging/iotcon-old.manifest b/packaging/iotcon-old.manifest new file mode 100644 index 0000000..64f37e8 --- /dev/null +++ b/packaging/iotcon-old.manifest @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packaging/iotcon-test-old.manifest b/packaging/iotcon-test-old.manifest new file mode 100644 index 0000000..cb964c2 --- /dev/null +++ b/packaging/iotcon-test-old.manifest @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/packaging/iotcon-test-v2.manifest b/packaging/iotcon-test-v2.manifest deleted file mode 100644 index cb964c2..0000000 --- a/packaging/iotcon-test-v2.manifest +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/packaging/iotcon-v2.manifest b/packaging/iotcon-v2.manifest deleted file mode 100644 index 64f37e8..0000000 --- a/packaging/iotcon-v2.manifest +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packaging/iotcon-v3.manifest b/packaging/iotcon-v3.manifest deleted file mode 100644 index a76fdba..0000000 --- a/packaging/iotcon-v3.manifest +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/packaging/iotcon.manifest b/packaging/iotcon.manifest new file mode 100644 index 0000000..a76fdba --- /dev/null +++ b/packaging/iotcon.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/packaging/iotcon.service b/packaging/iotcon.service index 243a64b..3a463e7 100644 --- a/packaging/iotcon.service +++ b/packaging/iotcon.service @@ -1,5 +1,5 @@ [Unit] -Description=IoT Connectivity Manager +Description=Tizen IoT Connectivity After=system-server.service Requires=system-server.service diff --git a/packaging/iotcon.spec b/packaging/iotcon.spec index e28604c..0a76e8f 100644 --- a/packaging/iotcon.spec +++ b/packaging/iotcon.spec @@ -1,15 +1,15 @@ Name: iotcon -Summary: IoT Connectivity Manager +Summary: Tizen IoT Connectivity Version: 0.0.1 Release: 0 -Group: Network & Connectivity/Other +Group: Network & Connectivity/Service License: Apache-2.0 Source0: %{name}-%{version}.tar.gz Source1: %{name}.service -Source1001: %{name}-v3.manifest -Source1002: %{name}-v2.manifest -Source1003: lib%{name}-v2.manifest -Source1004: %{name}-test-v2.manifest +Source1001: %{name}.manifest +Source1002: %{name}-old.manifest +Source1003: lib%{name}-old.manifest +Source1004: %{name}-test-old.manifest Source2001: %{name}.conf.in BuildRequires: cmake BuildRequires: boost-devel @@ -24,20 +24,20 @@ BuildRequires: python-xml %define _unitdir /usr/lib/systemd/system %description -IoT Connectivity Manager Daemon +Tizen IoT Connectivity based on Iotivity %package lib -Summary: IoT Connectivity Library +Summary: Tizen IoT Connectivity Library Group: Network & Connectivity/Libraries Requires: %{name} = %{version} %description lib -Tizen event notification service Client library for applications. +Tizen IoT Connectivity Library(Client) for applications. %package devel -Summary: IoT Connectivity Manager (devel) +Summary: TizenIoT Connectivity(devel) Group: Network & Connectivity/Development Requires: %{name}-lib = %{version} @@ -46,32 +46,39 @@ IoT Connectivity Manager development Kit %package test -Summary: IoT Connectivity Manager (test) -Group: Network & Connectivity/Development +Summary: Tizen IoT Connectivity(test) +Group: Network & Connectivity/Testing Requires: %{name}-lib = %{version} %description test -IoT Connectivity Manager Test Programs +Tizen IoT Connectivity Test Programs %prep %setup -q -%if %tizen_version_major == 3 +chmod g-w %_sourcedir/* +%if %tizen_version_major < 3 +cp %{SOURCE1002} ./%{name}.manifest +cp %{SOURCE1003} ./lib%{name}.manifest +cp %{SOURCE1004} ./%{name}-test.manifest +%else cp %{SOURCE1001} ./%{name}.manifest cp %{SOURCE1001} ./lib%{name}.manifest cp %{SOURCE1001} ./%{name}-test.manifest cp %{SOURCE2001} . -%else -cp %{SOURCE1002} ./%{name}.manifest -cp %{SOURCE1003} ./lib%{name}.manifest -cp %{SOURCE1004} ./%{name}-test.manifest %endif %build MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` +%if 0%{?tizen_version_major} < 3 +NEW_SECURE=0 +%else +NEW_SECURE=1 +%endif + %cmake . -DMAJORVER=${MAJORVER} -DFULLVER=%{version} -DBIN_INSTALL_DIR:PATH=%{_bindir} \ - -DTZ_VER=%{tizen_version_major} + -DNEW_SECURE=${NEW_SECURE} %install diff --git a/packaging/libiotcon-old.manifest b/packaging/libiotcon-old.manifest new file mode 100644 index 0000000..a76fdba --- /dev/null +++ b/packaging/libiotcon-old.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/packaging/libiotcon-v2.manifest b/packaging/libiotcon-v2.manifest deleted file mode 100644 index a76fdba..0000000 --- a/packaging/libiotcon-v2.manifest +++ /dev/null @@ -1,5 +0,0 @@ - - - - -