From ebd7a967bee7d23c40db42c3ee5c3f9a9b13d4f9 Mon Sep 17 00:00:00 2001
From: Seungyoun Ju <sy39.ju@samsung.com>
Date: Sat, 16 Feb 2013 13:31:41 +0900
Subject: [PATCH] Build option clean-up and g_type_init is deprecated from glib
 2.35

- Issues
  cmake macro is not used and g_type_init() is deprecated from glib 2.35

- Fix description
  cmake macro is used and g_type_init() is blocked using define

Change-Id: I0a67aefc637502b9b934c9fd232e52ff81552cb9
---
 CMakeLists.txt                | 17 +++++++----------
 packaging/mobileap-agent.spec | 15 +++++++++------
 src/mobileap_main.c           |  2 ++
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 306d414..1b66801 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,31 +12,28 @@ SET(SRCS src/mobileap_agent.c
 	src/mobileap_network.c
 )
 
-SET(APP_VENDOR "samsung")
+SET(CMAKE_INSTALL_PREFIX /usr)
+
+SET(APP_VENDOR "tizen")
 SET(APP_NAME mobileap-agent)
-SET(APP_DIR /usr/bin)
+SET(APP_DIR ${CMAKE_INSTALL_PREFIX}/bin)
 SET(INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include)
 
 IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
 	SET(CMAKE_BUILD_TYPE "Release")
 ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "")
 
-IF("${CMAKE_BUILD_TYPE}" STREQUAL "Private")
-	SET(CMAKE_BUILD_TYPE "Release")
-	ADD_DEFINITIONS("-D__PRIVATE_CODE__")
-	SET(PRIVATE_REQUIRED_PKGS "mdm kies-control-point")
-ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "Private")
 MESSAGE("Build type: ${CMAKE_BUILD_TYPE}")
 
 INCLUDE_DIRECTORIES(${INCLUDE_DIR})
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs REQUIRED dlog dbus-glib-1 pmapi vconf notification libssl secure-storage capi-network-connection capi-network-bluetooth ${PRIVATE_REQUIRED_PKGS})
+pkg_check_modules(pkgs REQUIRED dlog dbus-glib-1 pmapi vconf notification libssl secure-storage capi-network-connection capi-network-bluetooth)
 FOREACH(flag ${pkgs_CFLAGS})
 	SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fpie -Wall")
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 SET(CMAKE_C_FLAGS_RELEASE "-O2")
 
@@ -55,7 +52,7 @@ ADD_DEFINITIONS("-DVENDOR=\"${APP_VENDOR}\"")
 ADD_DEFINITIONS("-DAPPNAME=\"${APP_NAME}\"")
 ADD_DEFINITIONS("-DAPP_DIR=\"${APP_DIR}\"")
 
-SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
+SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed -pie")
 
 ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
diff --git a/packaging/mobileap-agent.spec b/packaging/mobileap-agent.spec
index 57786b9..33c279f 100644
--- a/packaging/mobileap-agent.spec
+++ b/packaging/mobileap-agent.spec
@@ -1,9 +1,9 @@
 Name:       mobileap-agent
 Summary:    Mobile AP daemon for setting tethering environments
-Version:    0.1.84
-Release:    1
+Version:    0.1.85
+Release:    2
 Group:      TO_BE/FILLED_IN
-License:    Apache License Version 2.0
+License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(dbus-glib-1)
@@ -27,12 +27,10 @@ Mobile AP daemon for setting tethering environments
 %setup -q
 
 %build
-export CFLAGS+=" -fpie"
-CFLAGS="${CFLAGS}" cmake . -DCMAKE_INSTALL_PREFIX="%{_prefix}"
+%cmake .
 make %{?jobs:-j%jobs}
 
 %install
-rm -rf %{buildroot}
 %make_install
 
 %post
@@ -48,6 +46,11 @@ rm -rf %{buildroot}
 %{_bindir}/mobileap-agent
 
 %changelog
+* Sat Feb 16 2013 Seungyoun Ju <sy39.ju@samsung.com> 0.1.85-2
+- Function return value is checked
+- Private SSID is considered
+- Build option clean-up and g_type_init is deprecated from glib 2.35
+
 * Thu Feb 14 2013 Seungyoun Ju <sy39.ju@samsung.com> 0.1.84-1
 - User is specified in service file for Dbus auto activation
 
diff --git a/src/mobileap_main.c b/src/mobileap_main.c
index bfb1f8e..fcc3c70 100644
--- a/src/mobileap_main.c
+++ b/src/mobileap_main.c
@@ -488,7 +488,9 @@ int main(int argc, char **argv)
 	GError *error = NULL;
 	int mobileap_vconf_key = VCONFKEY_MOBILE_HOTSPOT_MODE_NONE;
 
+#if !GLIB_CHECK_VERSION(2,35,0)
 	g_type_init();
+#endif
 
 	if (vconf_get_int(VCONFKEY_MOBILE_HOTSPOT_MODE, &mobileap_vconf_key)) {
 		ERR("vconf_get_int FAIL\n");
-- 
2.7.4