fix rpm warning

Change-Id: Ibe4bbf572a99cb00a730668ad67ee3e68cfb2264

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ec9cd6cf2628bee62ab931d8d9c872953c243eb..f2da51bcee6020e7109417835bc54715680028a1 100644 (file)
--- 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 72c29a17292215f8829f1fa57c1e8b16903aa31e..48a4184ce161a360fad79899dd3c47533e7bc99d 100644 (file)
--- 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 (file)
index 0000000..64f37e8
--- /dev/null
+++ b/packaging/iotcon-old.manifest
@@ -0,0 +1,31 @@
+<manifest>
+       <define>
+               <domain name="iotcon" />
+               <permit>
+                       <smack permit="system::use_internet" type="w" />
+                       <smack permit="dbus" type="rwx" />
+               </permit>
+               <request>
+                       <smack request="system::use_internet" type="w" />
+                       <smack request="connman::get" type="w" />
+                       <smack request="dbus" type="rwx" />
+                       <smack request="device::app_logging" type="w" />
+                       <smack request="device::sys_logging" type="w" />
+               </request>
+       </define>
+       <assign>
+               <filesystem path="/usr/share/license/iotcon" label="_" />
+               <filesystem path="/usr/share/dbus-1/services/org.tizen.iotcon.dbus.service" label="_" />
+
+               <dbus name="org.tizen.iotcon.dbus" own="iotcon" bus="system">
+                       <node name="/org/tizen/iotcon/dbus">
+                               <interface name="org.tizen.iotcon.dbus">
+                                       <annotation name="com.tizen.smack" value="iotcon"/>
+                               </interface>
+                       </node>
+               </dbus>
+       </assign>
+       <request>
+               <domain name="iotcon" />
+       </request>
+</manifest>

diff --git a/packaging/iotcon-test-old.manifest b/packaging/iotcon-test-old.manifest
new file mode 100644 (file)
index 0000000..cb964c2
--- /dev/null
+++ b/packaging/iotcon-test-old.manifest
@@ -0,0 +1,13 @@
+<manifest>
+       <define>
+               <domain name="iotcon-test" />
+               <request>
+                       <smack request="iotcon" type="rw" />
+                       <smack request="device::app_logging" type="w" />
+                       <smack request="device::sys_logging" type="w" />
+               </request>
+       </define>
+       <request>
+               <domain name="iotcon-test" />
+       </request>
+</manifest>

diff --git a/packaging/iotcon-test-v2.manifest b/packaging/iotcon-test-v2.manifest
deleted file mode 100644 (file)
index cb964c2..0000000
--- a/packaging/iotcon-test-v2.manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-<manifest>
-       <define>
-               <domain name="iotcon-test" />
-               <request>
-                       <smack request="iotcon" type="rw" />
-                       <smack request="device::app_logging" type="w" />
-                       <smack request="device::sys_logging" type="w" />
-               </request>
-       </define>
-       <request>
-               <domain name="iotcon-test" />
-       </request>
-</manifest>

diff --git a/packaging/iotcon-v2.manifest b/packaging/iotcon-v2.manifest
deleted file mode 100644 (file)
index 64f37e8..0000000
--- a/packaging/iotcon-v2.manifest
+++ /dev/null
@@ -1,31 +0,0 @@
-<manifest>
-       <define>
-               <domain name="iotcon" />
-               <permit>
-                       <smack permit="system::use_internet" type="w" />
-                       <smack permit="dbus" type="rwx" />
-               </permit>
-               <request>
-                       <smack request="system::use_internet" type="w" />
-                       <smack request="connman::get" type="w" />
-                       <smack request="dbus" type="rwx" />
-                       <smack request="device::app_logging" type="w" />
-                       <smack request="device::sys_logging" type="w" />
-               </request>
-       </define>
-       <assign>
-               <filesystem path="/usr/share/license/iotcon" label="_" />
-               <filesystem path="/usr/share/dbus-1/services/org.tizen.iotcon.dbus.service" label="_" />
-
-               <dbus name="org.tizen.iotcon.dbus" own="iotcon" bus="system">
-                       <node name="/org/tizen/iotcon/dbus">
-                               <interface name="org.tizen.iotcon.dbus">
-                                       <annotation name="com.tizen.smack" value="iotcon"/>
-                               </interface>
-                       </node>
-               </dbus>
-       </assign>
-       <request>
-               <domain name="iotcon" />
-       </request>
-</manifest>

diff --git a/packaging/iotcon-v3.manifest b/packaging/iotcon-v3.manifest
deleted file mode 100644 (file)
index a76fdba..0000000
--- a/packaging/iotcon-v3.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-       <request>
-               <domain name="_" />
-       </request>
-</manifest>

diff --git a/packaging/iotcon.manifest b/packaging/iotcon.manifest
new file mode 100644 (file)
index 0000000..a76fdba
--- /dev/null
+++ b/packaging/iotcon.manifest
@@ -0,0 +1,5 @@
+<manifest>
+       <request>
+               <domain name="_" />
+       </request>
+</manifest>

diff --git a/packaging/iotcon.service b/packaging/iotcon.service
index 243a64b365495ae94e28204f59527125d8bd0886..3a463e7293cb08db8846cb81d6ec05734924a747 100644 (file)
--- 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 e28604c977c01832c0c1c79698dcf146c184d353..0a76e8fca79fe8ff1a32ca2160beceab79b1f2a0 100644 (file)
--- 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 (file)
index 0000000..a76fdba
--- /dev/null
+++ b/packaging/libiotcon-old.manifest
@@ -0,0 +1,5 @@
+<manifest>
+       <request>
+               <domain name="_" />
+       </request>
+</manifest>

diff --git a/packaging/libiotcon-v2.manifest b/packaging/libiotcon-v2.manifest
deleted file mode 100644 (file)
index a76fdba..0000000
--- a/packaging/libiotcon-v2.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-       <request>
-               <domain name="_" />
-       </request>
-</manifest>