Removed the dependency of lbs-dbus in spec file. 36/51636/2 accepted/tizen/mobile/20151112.074907 submit/tizen_mobile/20151112.052657
authorYoung-Ae Kang <youngae.kang@samsung.com>
Wed, 11 Nov 2015 14:19:32 +0000 (23:19 +0900)
committerYoung-Ae Kang <youngae.kang@samsung.com>
Thu, 12 Nov 2015 03:07:56 +0000 (12:07 +0900)
Change-Id: Ifc3941c29c9f6867c446110d2411250654a721f5

CMakeLists.txt
location/CMakeLists.txt
packaging/liblbs-location.spec

index 1123dca..d8e20a5 100755 (executable)
@@ -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)
index d0d6830..3c66d9b 100644 (file)
@@ -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(
index 930b5a6..8a739f7 100755 (executable)
@@ -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