Set RPM CPack variables already in CMakeList.txt.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f93c1f7..8aec4b8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -349,12 +349,17 @@ if (BUILD_PACKAGING)
   set (CPACK_RESOURCE_FILE_WELCOME       "${CMAKE_CURRENT_LIST_DIR}/README.txt")
   set (CPACK_RESOURCE_FILE_LICENSE       "${CMAKE_CURRENT_LIST_DIR}/COPYING.txt")
   set (CPACK_PACKAGE_DESCRIPTION_FILE    "${CMAKE_CURRENT_LIST_DIR}/README.txt")
-  set (CPACK_RESOURCE_FILE_CHANGELOG     "${CMAKE_CURRENT_LIST_DIR}/ChangeLog.txt")
   set (CPACK_INSTALL_PREFIX              "${CMAKE_INSTALL_PREFIX}")
   set (CPACK_OUTPUT_FILE_PREFIX          packages)
   set (CPACK_PACKAGE_RELOCATABLE         TRUE)
   set (CPACK_MONOLITHIC_INSTALL          TRUE)
 
+  # RPM specification
+  set (CPACK_RPM_PACKAGE_GROUP   "Development/Libraries")
+  set (CPACK_RPM_PACKAGE_LICENSE "BSD")
+  set (CPACK_RPM_PACKAGE_URL     "http://code.google.com/p/gflags")
+  set (CPACK_RPM_CHANGELOG_FILE  "${CMAKE_CURRENT_LIST_DIR}/ChangeLog.txt")
+
   if (INSTALL_HEADERS)
     set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_LIST_DIR}/doc/gflags.html")
   else ()

diff --git a/cmake/package.cmake.in b/cmake/package.cmake.in
index 3414d21..05f378f 100644 (file)
--- a/cmake/package.cmake.in
+++ b/cmake/package.cmake.in
@@ -51,9 +51,4 @@ elseif ("^${CPACK_GENERATOR}$" STREQUAL "RPM")
   endif ()
   set (CPACK_PACKAGE_FILE_NAME   "${CPACK_PACKAGE_FILE_NAME}-${CPACK_PACKAGE_VERSION}-1_${CMAKE_SYSTEM_PROCESSOR}")
 
-  set (CPACK_RPM_PACKAGE_GROUP   "Development/Libraries")
-  set (CPACK_RPM_PACKAGE_LICENSE "BSD")
-  set (CPACK_RPM_PACKAGE_URL     "http://code.google.com/p/gflags")
-  set (CPACK_RPM_CHANGELOG_FILE  "@CPACK_RESOURCE_FILE_CHANGELOG@")
-
 endif ()