diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9149263..465dd6e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,8 @@ set_target_properties(${lib_name}_static PROPERTIES OUTPUT_NAME ${lib_name})
 
 set(CMAKE_INSTALL_PREFIX /opt/MESA)
 
-install(TARGETS ${lib_name}_shared  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+install(TARGETS ${lib_name}_shared  LIBRARY DESTINATION
+    ${CMAKE_INSTALL_PREFIX}/lib)
 install(FILES inc/${lib_name}.h   DESTINATION
     ${CMAKE_INSTALL_PREFIX}/include/MESA COMPONENT devel)
 
diff --git a/cmake/Package.cmake b/cmake/Package.cmake
index 13573d3..c9624c1 100644
--- a/cmake/Package.cmake
+++ b/cmake/Package.cmake
@@ -12,30 +12,34 @@ set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
 set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}.${VERSION_BUILD}")
 set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
 
-set(CPACK_COMPONENTS_ALL devel)
-set(CPACK_RPM_PACKAGE_DEBUG 1)
-set(CPACK_RPM_COMPONENT_INSTALL ON)
-set(CPACK_RPM_DEVEL_FILE_NAME "${PROJECT_NAME}-devel.rpm")
-set(CPACK_RPM_DEVEL_DEBUGINFO_FILE_NAME "${PROJECT_NAME}-devel-debuginfo.rpm")
+#set(CPACK_COMPONENTS_ALL devel)
+#set(CPACK_RPM_PACKAGE_DEBUG 1)
+#set(CPACK_RPM_DEVEL_FILE_NAME "${PROJECT_NAME}-devel.rpm")
+#set(CPACK_RPM_DEVEL_DEBUGINFO_FILE_NAME "${PROJECT_NAME}-devel-debuginfo.rpm")
 
 # RPM Build
 set(CPACK_GENERATOR "RPM")
-set(CPACK_RPM_AUTO_GENERATED_FILE_NAME ON)
-set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
+#set(CPACK_RPM_AUTO_GENERATED_FILE_NAME ON)
+#set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
 set(CPACK_RPM_PACKAGE_VENDOR "MESA")
-set(CPACK_RPM_PACKAGE_AUTOREQPROV "no")
-set(CPACK_RPM_PACKAGE_RELEASE_DIST ON)
-set(CPACK_RPM_DEBUGINFO_PACKAGE ON)
+#set(CPACK_RPM_PACKAGE_AUTOREQPROV "no")
+#set(CPACK_RPM_PACKAGE_RELEASE_DIST ON)
+set(CPACK_RPM_COMPONENT_INSTALL ON)
+#set(CPACK_RPM_PACKAGE_COMPONENT devel)
+#set(CPACK_RPM_DEBUGINFO_PACKAGE ON)
+set(CPACK_RPM_DEVEL_DEBUGINFO_PACKAGE ON)
+set(CPACK_RPM_PACKAGE_SOURCES OFF)
 
+#set(CPACK_RPM_DEBUGINFO_SINGLE_PACKAGE ON)
+#set(CPACK_BUILD_SOURCE_DIRS ${PROJECT_SOURCE_DIR})
+#set(CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX ${CMAKE_INSTALL_PREFIX}/src/)
 
-set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}")
-
-# Must uninstall the debug package before install release package
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(CPACK_RPM_PACKAGE_CONFLICTS "${lib_name}-debug")
-else()
-    set(CPACK_RPM_PACKAGE_CONFLICTS ${lib_name})
-    #    set(CPACK_STRIP_FILES TRUE)
-endif()
+## Must uninstall the debug package before install release package
+#if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+#    set(CPACK_RPM_PACKAGE_CONFLICTS "${lib_name}-debug")
+#else()
+#    set(CPACK_RPM_PACKAGE_CONFLICTS ${lib_name})
+#    #    set(CPACK_STRIP_FILES TRUE)
+#endif()
 
 include(CPack)