From 38b51665430d5501e3e0df791b60e1a88fc879bc Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Mon, 13 Jul 2015 13:03:15 +0300
Subject: [PATCH] fixed double definition of CMake variables.

---
 CMakeLists.txt          |  2 +-
 cmake/package_rpm.cmake | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5f601768..ee0d8523c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -270,7 +270,7 @@ add_custom_target(buildtests
 ) 
 
 add_custom_target(testall 
-  COMMAND ${CMAKE_COMMAND} ${CMAKE_SOURCE_DIR} -DBUILD_TESTS=Y -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR} -DWITH_SCRIPTS=N -DMAXSCALE_VARDIR=${CMAKE_BINARY_DIR}
+  COMMAND ${CMAKE_COMMAND} ${CMAKE_SOURCE_DIR} -DBUILD_TESTS=Y -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR} -DWITH_SCRIPTS=N -DWITH_MAXSCALE_CNF=N -DMAXSCALE_VARDIR=${CMAKE_BINARY_DIR}
   COMMAND make install
   COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/testall.cmake
   COMMENT "Running full test suite..." VERBATIM)
diff --git a/cmake/package_rpm.cmake b/cmake/package_rpm.cmake
index 0f65bcdd2..7f11587a7 100644
--- a/cmake/package_rpm.cmake
+++ b/cmake/package_rpm.cmake
@@ -1,15 +1,5 @@
 # RPM specific CPack configuration parameters
 set(CPACK_GENERATOR "${CPACK_GENERATOR};RPM")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MaxScale")
-set(CPACK_PACKAGE_VERSION_MAJOR "${MAXSCALE_VERSION_MAJOR}")
-set(CPACK_PACKAGE_VERSION_MINOR "${MAXSCALE_VERSION_MINOR}")
-set(CPACK_PACKAGE_VERSION_PATCH "${MAXSCALE_VERSION_PATCH}")
-set(CPACK_PACKAGE_CONTACT "MariaDB Corporation Ab")
-set(CPACK_PACKAGE_FILE_NAME "maxscale-${MAXSCALE_VERSION}")
-set(CPACK_PACKAGE_NAME "maxscale")
-set(CPACK_PACKAGE_VENDOR "MariaDB Corporation Ab")
-set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_SOURCE_DIR}/etc/DESCRIPTION)
-set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
 set(CPACK_RPM_PACKAGE_RELEASE ${MAXSCALE_BUILD_NUMBER})
 set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE ${CMAKE_BINARY_DIR}/postinst)
 set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_BINARY_DIR}/postrm)