Generate debuginfo package instead of debug package

Change-Id: Ibacce7d46294fcbfc3df98575dc39846a6863a02

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f1400f..41e0ebb 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,11 +11,11 @@ INCLUDE_DIRECTORIES(
        /usr/include
        /usr/include/curl
        /usr/include/libxml2
-       /usr/include/glib-2.0 
+       /usr/include/glib-2.0
        /usr/lib/glib-2.0/include
        /usr/include/osp
        /usr/include/osp/app
-       /usr/include/osp/base   
+       /usr/include/osp/base
        /usr/include/osp/io
        /usr/include/osp/graphics
        /usr/include/osp/media
@@ -64,31 +64,18 @@ TARGET_LINK_LIBRARIES(${this_target} "-losp-uifw" )
 TARGET_LINK_LIBRARIES(${this_target} "-losp-net" )
 TARGET_LINK_LIBRARIES(${this_target} "-lpthread" )
 
-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                      
+               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 "*"
-               PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ                                          
-                                       GROUP_EXECUTE GROUP_READ
-                                       WORLD_EXECUTE WORLD_READ)
 
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/inc/ DESTINATION include/osp FILES_MATCHING PATTERN "*.h")
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/inc/ DESTINATION include/osp/media FILES_MATCHING PATTERN "*.h")

diff --git a/packaging/osp-image.spec b/packaging/osp-image.spec
index f54622c..d599288 100755 (executable)
--- a/packaging/osp-image.spec
+++ b/packaging/osp-image.spec
@@ -1,8 +1,5 @@
-%define debug_package %{nil}
-%define __strip /bin/true
-
 Name:       osp-image
-Summary:    The Media Image library of OSP 
+Summary:    The Media Image library of OSP
 Version:    1.2.1.0
 Release:    1
 Group:      TO_BE/FILLED_IN
@@ -32,9 +29,9 @@ Requires: osp-image-core
 Requires: osp-uifw
 Requires: osp-net
 
-Provides:   libosp-image.so.1 
+Provides:   libosp-image.so.1
 
-Requires(post): /sbin/ldconfig  
+Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
 %description
@@ -56,14 +53,6 @@ Requires:   %{name} = %{version}-%{release}
 %description internal-devel
 The Media Image library of OSP (Internal-DEV)
 
-%package debug
-Summary:    The Media Image library of OSP (Development)
-Group:      TO_BE/FILLED_IN
-Requires:   %{name} = %{version}-%{release}
-
-%description debug
-The Media Image library of OSP (DEV)
-
 %prep
 %setup -q
 
@@ -100,7 +89,3 @@ cp %{_builddir}/%{name}-%{version}/LICENSE.APLv2.0  %{buildroot}/usr/share/licen
 
 %files internal-devel
 %{_includedir}/osp/media/*.h
-
-%files debug
-%{_libdir}/osp/debug/*.so*
-