From d877678baff5f1e24506dc166a981950c833e7ad Mon Sep 17 00:00:00 2001 From: Young-Ae Kang Date: Wed, 11 Nov 2015 23:19:32 +0900 Subject: [PATCH] Removed the dependency of lbs-dbus in spec file. Change-Id: Ifc3941c29c9f6867c446110d2411250654a721f5 --- CMakeLists.txt | 2 +- location/CMakeLists.txt | 20 +++++++++++--------- packaging/liblbs-location.spec | 4 ++-- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1123dca..d8e20a5 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,7 +52,7 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX}) CONFIGURE_FILE(lbs-location.pc.in lbs-location.pc @ONLY) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/lbs-location.pc DESTINATION ${LIBDIR}/pkgconfig) -#INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME liblbs-dbus) +#INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME liblbs-location) ADD_SUBDIRECTORY(location) #ADD_SUBDIRECTORY(tests) diff --git a/location/CMakeLists.txt b/location/CMakeLists.txt index d0d6830..3c66d9b 100644 --- a/location/CMakeLists.txt +++ b/location/CMakeLists.txt @@ -7,18 +7,20 @@ SET(MANAGER_DIR "manager") SET(MODULE_DIR "module") IF(FEATURE_PROFILE_TV) - SET (PRIVACY_SRC "") + SET(PRIVACY_SRC "") + + MESSAGE("<<< TV Profile >>>") ELSE(FEATURE_PROFILE_TV) - SET (PRIVACY_SRC "${MANAGER_DIR}/location-privacy.c") + SET(PRIVACY_SRC "${MANAGER_DIR}/location-privacy.c") + + IF(FEATURE_PROFILE_WEARABLE) + MESSAGE("<<< Wearable Profile >>>") + ELSE(FEATURE_PROFILE_WEARABLE) + MESSAGE("<<< Mobile Profile >>>") + ADD_DEFINITIONS("-DTIZEN_PROFILE_MOBILE") + ENDIF(FEATURE_PROFILE_WEARABLE) ENDIF(FEATURE_PROFILE_TV) -IF(FEATURE_PROFILE_WEARABLE) - MESSAGE("<<< Wearable Profile >>>") -ELSE(FEATURE_PROFILE_WEARABLE) - MESSAGE("<<< Mobile Profile >>>") - ADD_DEFINITIONS("-DTIZEN_PROFILE_MOBILE") -ENDIF(FEATURE_PROFILE_WEARABLE) - ADD_DEFINITIONS("-DLIBDIR=\"${LIBDIR}\"") INCLUDE_DIRECTORIES( diff --git a/packaging/liblbs-location.spec b/packaging/liblbs-location.spec index 930b5a6..8a739f7 100755 --- a/packaging/liblbs-location.spec +++ b/packaging/liblbs-location.spec @@ -20,7 +20,6 @@ BuildRequires: pkgconfig(pkgmgr-info) BuildRequires: pkgconfig(privacy-manager-client) %endif BuildRequires: pkgconfig(json-glib-1.0) -BuildRequires: pkgconfig(lbs-dbus) BuildRequires: pkgconfig(bundle) BuildRequires: pkgconfig(eventsystem) @@ -50,7 +49,7 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE" # Call make instruction with smp support MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DBUILD_PKGTYPE=rpm -DLIBDIR=%{_libdir} -DINCLUDEDIR=%{_includedir} \ +cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIBDIR=%{_libdir} -DINCLUDEDIR=%{_includedir} \ -DFULLVER=%{version} -DMAJORVER=${MAJORVER} \ %if "%{profile}" == "wearable" -DFEATURE_PROFILE_WEARABLE:BOOL=ON \ @@ -82,6 +81,7 @@ rm -rf %{buildroot} %files %manifest %{name}.manifest +%license LICENSE %{_libdir}/*.so.* %files devel -- 2.7.4