From 1c09b080c21e4505770ed2133bbb674ff2f00eb9 Mon Sep 17 00:00:00 2001
From: "jh0522.choi" <jh0522.choi@samsung.com>
Date: Thu, 29 Aug 2013 09:47:08 +0900
Subject: [PATCH] Generate debuginfo package instead of debug package

Change-Id: I68579175e6cd18865dba88ff36bc2e03ed877f3f
---
 CMakeLists.txt               | 31 +++++++++----------------------
 packaging/osp-bluetooth.spec | 20 +++-----------------
 2 files changed, 12 insertions(+), 39 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6818a4d..a04d661 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,17 +9,17 @@ INCLUDE_DIRECTORIES(
 	src
 	src/inc
 	/usr/include/chromium
-	/usr/include/glib-2.0 
+	/usr/include/glib-2.0
   /usr/lib/glib-2.0/include
 	/usr/include/system
 	/usr/include/network
 	/usr/include/osp
 	/usr/include/osp/app
 	/usr/include/osp/base
-	/usr/include/osp/io	
+	/usr/include/osp/io
 	/usr/include/osp/net
-	/usr/include/osp/security	
-	/usr/include/osp/system	
+	/usr/include/osp/security
+	/usr/include/osp/system
 )
 
 SET (${this_target}_SOURCE_FILES
@@ -83,29 +83,16 @@ TARGET_LINK_LIBRARIES(${this_target} "-lpthread" )
 TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib/osp -losp-appfw -losp-net" )
 TARGET_LINK_LIBRARIES(${this_target} "-lcapi-network-bluetooth" )
 
-SET_TARGET_PROPERTIES(${this_target} 
-	PROPERTIES 
+SET_TARGET_PROPERTIES(${this_target}
+	PROPERTIES
 	VERSION ${FULLVER}
 	SOVERSION ${MAJORVER}
 	CLEAN_DIRECT_OUTPUT 1
 	)
 
-ADD_CUSTOM_COMMAND(TARGET ${this_target}
-    POST_BUILD
-		COMMAND ${CMAKE_COMMAND} -E copy ${LIBRARY_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX} ${LIBRARY_OUTPUT_PATH}/debug/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX}.${FULLVER} 
-		COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX}.${FULLVER} ${LIBRARY_OUTPUT_PATH}/debug/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX}.${MAJORVER}
-		COMMAND ${CMAKE_STRIP} --strip-unneeded ${LIBRARY_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX}
-    COMMENT "strip ${this_target}"
-		)   
-
-INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/ DESTINATION lib/osp 
-				FILES_MATCHING PATTERN "*.so*" 
-				PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ					  
-										GROUP_EXECUTE GROUP_READ
-										WORLD_EXECUTE WORLD_READ)
-INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/debug/ DESTINATION lib/osp/debug 
-				FILES_MATCHING PATTERN "*.so*" 
-				PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ					  
+INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/ DESTINATION lib/osp
+				FILES_MATCHING PATTERN "*.so*"
+				PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
 										GROUP_EXECUTE GROUP_READ
 										WORLD_EXECUTE WORLD_READ)
 
diff --git a/packaging/osp-bluetooth.spec b/packaging/osp-bluetooth.spec
index 5dc8a0b..7e96c78 100755
--- a/packaging/osp-bluetooth.spec
+++ b/packaging/osp-bluetooth.spec
@@ -1,6 +1,3 @@
-%define debug_package %{nil}
-%define __strip /bin/true
-
 Name:		osp-bluetooth
 Summary:	osp bluetooth library
 Version:	1.2.1.0
@@ -20,8 +17,8 @@ BuildRequires:  pkgconfig(osp-net)
 BuildRequires:  osp-net-internal-devel
 
 # runtime requires
-Requires: osp-appfw 
-Requires: osp-net 
+Requires: osp-appfw
+Requires: osp-net
 
 %description
 osp bluetooth library
@@ -42,18 +39,10 @@ Requires:   %{name} = %{version}-%{release}
 %description internal-devel
 osp bluetooth library (Internal-DEV)
 
-%package debug
-Summary:    osp bluetooth library (Development)
-Group:      TO_BE/FILLED_IN
-Requires:   %{name} = %{version}-%{release}
-
-%description debug
-osp bluetooth library (DEV)
-
 %prep
 %setup -q
 
-%build 
+%build
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %ifarch %{ix86}
 CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_X86_ -D_OSP_EMUL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
@@ -86,6 +75,3 @@ cp %{_builddir}/%{name}-%{version}/LICENSE.APLv2.0  %{buildroot}/usr/share/licen
 
 %files internal-devel
 %{_includedir}/osp/net/*.h
-
-%files debug
-%{_libdir}/osp/debug/*.so*
-- 
2.7.4