Clean up BuildRequires and remove unused DPL log code

Tizen WRT specific DPL BuildRequires are not used and therefore
can be removed.

Additionally, update .spec file to remove some rpmlint warnings.

Change-Id: Ic4b90f06535083e025f682e65e5d2d013057f43b
Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e12dcb9..1b8292b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,14 +8,12 @@ SET(CMAKE_INSTALL_PREFIX "/usr")
 # -----------------------------------------------------------------------------
 INCLUDE(FindPkgConfig)
 
-PKG_CHECK_MODULES(dpl REQUIRED dpl-efl)
 PKG_CHECK_MODULES(glib REQUIRED glib-2.0)
 PKG_CHECK_MODULES(gio REQUIRED gio-2.0)
 PKG_CHECK_MODULES(dbus REQUIRED dbus-1)
 PKG_CHECK_MODULES(libebook-contacts REQUIRED libebook-contacts-1.2)
 
 INCLUDE_DIRECTORIES(
-  ${dpl_INCLUDE_DIRS}
   ${glib_INCLUDE_DIRS}
   ${gio_INCLUDE_DIRS}
   ${dbus_INCLUDE_DIRS}
@@ -23,19 +21,6 @@ INCLUDE_DIRECTORIES(
 )
 
 # -----------------------------------------------------------------------------
-# Determine the log option
-# -----------------------------------------------------------------------------
-
-OPTION(DPL_LOG "DPL logs status" ON)
-
-IF(DPL_LOG)
-    MESSAGE(STATUS "Logging enabled for DPL")
-    ADD_DEFINITIONS("-DDPL_LOGS_ENABLED")
-ELSE(DPL_LOG)
-    MESSAGE(STATUS "Logging disabled for DPL")
-ENDIF(DPL_LOG)
-
-# -----------------------------------------------------------------------------
 # Determine the time tracing option
 # -----------------------------------------------------------------------------
 
@@ -109,7 +94,6 @@ SET(SRCS src/phoned.cpp
 
 ADD_EXECUTABLE(${TARGET_NAME} ${SRCS})
 TARGET_LINK_LIBRARIES(${TARGET_NAME}
-                      ${dpl_LDFLAGS}
                       ${glib_LDFLAGS}
                       ${gio_LDFLAGS}
                       ${dbus_LDFLAGS}

diff --git a/packaging/phoned.spec b/packaging/phoned.spec
index 6daf445..6ed3f77 100644 (file)
--- a/packaging/phoned.spec
+++ b/packaging/phoned.spec
@@ -1,23 +1,17 @@
 Name:       phoned
-Summary:    A service to export OFono/Obex functionality over DBUS, to be used by WebRuntime plugin
+Summary:    OFono/Obex business logic for phone web APIs
 Version:    0.0.0
 Release:    1
-Group:      Development/Libraries
+Group:      Automotive/Modello
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 
-BuildRequires:  pkgconfig(ewebkit2)
-BuildRequires:  pkgconfig(dpl-efl)
-BuildRequires:  pkgconfig(dpl-event-efl)
-BuildRequires:  pkgconfig(wrt-plugins-commons)
-BuildRequires:  pkgconfig(wrt-plugins-commons-javascript)
-
-BuildRequires:  evolution-data-server-devel
-BuildRequires:  wrt-plugins-tizen-devel
-BuildRequires:  expat-devel
 BuildRequires:  cmake
 BuildRequires:  gettext-devel
+BuildRequires:  pkgconfig(libebook-contacts-1.2)
+BuildRequires:  pkgconfig(expat)
 BuildRequires:  pkgconfig(json-glib-1.0)
+BuildRequires:  pkgconfig(dbus-1)
 
 %description
 A service to export OFono/Obex functionality over DBUS, to be used by WebRuntime plugin
@@ -31,7 +25,7 @@ A service to export OFono/Obex functionality over DBUS, to be used by WebRuntime
 
 export LDFLAGS+="-Wl,--rpath=%{PREFIX} -Wl,--as-needed"
 
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DDPL_LOG="ON" -DENABLE_TIME_TRACER="OFF"
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DENABLE_TIME_TRACER="OFF"
 
 make %{?jobs:-j%jobs} VERBOSE=1
 
@@ -39,10 +33,6 @@ make %{?jobs:-j%jobs} VERBOSE=1
 rm -rf %{buildroot}
 %make_install
 
-%post
-
-%postun
-
 %files
 %{_libdir}/pkgconfig/phoned.pc
 %{_prefix}/sbin/phoned