[Tizen-submit] 16380: Changes to Tizen:Mobile/osp-connectivity-service

noreply at tizen.org noreply at tizen.org
Tue Oct 22 08:17:03 GMT 2013


Hi,
Woowon have made the following changes to osp-connectivity-service in project Tizen:Mobile. Please review and accept ASAP.

Thank You,

[This message was auto-generated]

---

Request: #16380

  submit:       Tizen:Mobile:build/osp-connectivity-service(cleanup) -> Tizen:Mobile


Message:
Submitter: Woowon <woowon.park at samsung.com>
Comments: Fix up spec file to use pkgconfig
Git project: platform/framework/native/connectivity-service
Tag: submit/tizen/20131022.081823
Commit: 1ee17e184e30b53baa4dff660f26a1c78a3c3fd5 Fix up spec file to use pkgconfig

State:   new        2013-10-22T08:18:31 tizenrobot
Comment: <no comment>
changes files:
--------------

spec files:
-----------
--- osp-connectivity-service.spec
+++ osp-connectivity-service.spec
@@ -1,13 +1,12 @@
 Name:           osp-connectivity-service
 Version:        1.2.1.0
 Release:        2
-VCS:            platform/framework/native/connectivity-service#submit/tizen/20131001.035401-0-gb64979c3daadd6d85679e6296b59267730f1ecff
+VCS:            platform/framework/native/connectivity-service#submit/tizen/20131022.081823-0-g1ee17e184e30b53baa4dff660f26a1c78a3c3fd5
 License:        Apache-2.0 or Flora
 Summary:        OSP Connectivity Service
 Group:          Telephony/Libraries
 Source0:        %{name}-%{version}.tar.gz
 BuildRequires:  cmake
-BuildRequires:  osp-appfw-internal-devel
 BuildRequires:  osp-bluetooth-internal-devel
 BuildRequires:  osp-net-internal-devel
 BuildRequires:  osp-nfc-internal-devel
@@ -34,6 +33,7 @@
 BuildRequires:  pkgconfig(tapi)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(wifi-direct)
+BuildRequires:  pkgconfig(osp-appfw-server)
 Requires:       osp-app-service
 Requires:       osp-appfw
 Requires:       osp-channel-service

other changes:
--------------

++++++ osp-connectivity-service-1.2.1.0.tar.gz
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -3,12 +3,14 @@
 SET (this_target osp-connectivity-service)
 SET (APPID 57r43275q7)
 
+INCLUDE(FindPkgConfig)
+pkg_check_modules(${this_target} REQUIRED osp-appfw-server osp-system-server osp-wifi ecore-x wifi-direct vconf tapi pkgmgr osp-telephony osp-nfc osp-net osp-bluetooth osp-appfw glib-2.0 evas ecore chromium capi-telephony-sim capi-system-info capi-system-device capi-network-wifi capi-network-nfc capi-network-connection capi-network-bluetooth capi-appfw-app-manager)
+
 SET(CMAKE_EXECUTABLE_SUFFIX ".exe")
 SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/output")
 
 INCLUDE_DIRECTORIES (
-	/usr/include/glib-2.0
-	/usr/lib/glib-2.0/include
+	${${this_target}_INCLUDE_DIRS}
 	/usr/include/osp
 	/usr/include/osp/app
 	/usr/include/osp/base
@@ -18,20 +20,6 @@
 	/usr/include/osp/net
 	/usr/include/osp/telephony
 	/usr/include/osp/server
-	/usr/include/chromium
-	/usr/include/vconf
-	/usr/include/appfw
-	/usr/include/ecore-1
-	/usr/include/evas-1
-	/usr/include/eina-1
-	/usr/include/eina-1/eina
-	/usr/include/bt-service
-	/usr/include/system
-	/usr/include/wifi
-	/usr/include/wifi-direct
-	/usr/include/network
-	/usr/include/telephony
-	/usr/include/telephony-client
 	inc
 	)
 
@@ -78,11 +66,7 @@
 ## Create Library
 ADD_EXECUTABLE (${this_target} ${${this_target}_SOURCE_FILES})
 
-
-TARGET_LINK_LIBRARIES(${this_target} -Xlinker --no-undefined -Xlinker --as-needed -pie)
-TARGET_LINK_LIBRARIES(${this_target} -Xlinker --version-script=${CMAKE_CURRENT_SOURCE_DIR}/system-service-export.ver)
-TARGET_LINK_LIBRARIES(${this_target} -L/usr/lib/osp -losp-appfw -losp-net -losp-wifi -lchromium -lcapi-network-wifi -lcapi-network-bluetooth -lcapi-network-connection -lcapi-network-nfc -lwifi-direct -lvconf -lcapi-telephony-sim -ltapi -lecore_x -lcapi-appfw-app-manager)
-TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib/osp-server -losp-appfw-server")
+TARGET_LINK_LIBRARIES(${this_target} ${${this_target}_LDFLAGS} ${${this_target}_LIBRARIES})
 

Please refer to OBS webUI for more details about this SR.


More information about the Tizen-submit mailing list