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

Change-Id: Ie076a51e4c29b36cf3cea10aaea1c25e7945c035
---
 CMakeLists.txt               | 25 ++++++-------------------
 packaging/osp-messaging.spec | 24 +++++-------------------
 2 files changed, 11 insertions(+), 38 deletions(-)
 mode change 100644 => 100755 CMakeLists.txt
 mode change 100644 => 100755 packaging/osp-messaging.spec

diff --git a/CMakeLists.txt b/CMakeLists.txt
old mode 100644
new mode 100755
index 8ca1882..473b54f
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ INCLUDE_DIRECTORIES(
 	src
 	src/inc
 	/usr/include/appfw
-	/usr/include/glib-2.0 
+	/usr/include/glib-2.0
 	/usr/lib/glib-2.0/include
 	/usr/include/osp
 	/usr/include/osp/app
@@ -98,29 +98,16 @@ TARGET_LINK_LIBRARIES(${this_target} "-lmsg_mapi" )
 TARGET_LINK_LIBRARIES(${this_target} "-lpush" )
 
 
-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-messaging.spec b/packaging/osp-messaging.spec
old mode 100644
new mode 100755
index 54d8040..2f6d4cf
--- a/packaging/osp-messaging.spec
+++ b/packaging/osp-messaging.spec
@@ -1,6 +1,3 @@
-%define debug_package %{nil}
-%define __strip /bin/true
-
 Name:		osp-messaging
 Summary:	osp messaging library
 Version:	1.2.1.0
@@ -28,10 +25,10 @@ BuildRequires:  pkgconfig(osp-json)
 BuildRequires:  pkgconfig(osp-shell)
 
 # runtime requires
-Requires: osp-appfw 
-Requires: osp-bluetooth 
-Requires: osp-nfc 
-Requires: osp-json 
+Requires: osp-appfw
+Requires: osp-bluetooth
+Requires: osp-nfc
+Requires: osp-json
 Requires: osp-shell
 
 %description
@@ -53,18 +50,10 @@ Requires:   %{name} = %{version}-%{release}
 %description internal-devel
 osp messaging library (Internal-DEV)
 
-%package debug
-Summary:    osp messaging library (Development)
-Group:      TO_BE/FILLED_IN
-Requires:   %{name} = %{version}-%{release}
-
-%description debug
-osp messaging 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}
@@ -97,6 +86,3 @@ cp %{_builddir}/%{name}-%{version}/LICENSE.APLv2  %{buildroot}/usr/share/license
 
 %files internal-devel
 %{_includedir}/osp/messaging/*.h
-
-%files debug
-%{_libdir}/osp/debug/*.so*
-- 
2.7.4