Use %{?dist} to get the rpm distro name, and remove the old Rpm.cmake

(cherry picked from commit 1f864f3522)

CMakeLists.txt

@@ -7,7 +7,6 @@ include(cmake/C++11Compat.cmake)
 include(cmake/Summary.cmake)
 include(cmake/Version.cmake)
 include(cmake/Deb.cmake)
-include(cmake/Rpm.cmake)
 include(cmake/SpotifyVersion.cmake)
 include(cmake/OptionalSource.cmake)
 include(cmake/Format.cmake)

cmake/Rpm.cmake

@@ -1,19 +0,0 @@
-set(RPMBUILD_DIR ~/rpmbuild CACHE STRING "Rpmbuild directory, for the rpm target")
-set(MOCK_COMMAND mock CACHE STRING "Command to use for running mock")
-set(MOCK_CHROOT fedora-13-x86_64 CACHE STRING "Chroot to use when building an rpm with mock")
-set(RPM_DISTRO fc13 CACHE STRING "Suffix of the rpm file")
-set(RPM_ARCH x86_64 CACHE STRING "Architecture of the rpm file")
-
-add_custom_target(rpm
-  COMMAND ${CMAKE_SOURCE_DIR}/dist/maketarball.sh
-  COMMAND ${CMAKE_COMMAND} -E copy clementine-${CLEMENTINE_VERSION_SPARKLE}.tar.xz ${RPMBUILD_DIR}/SOURCES/
-  COMMAND rpmbuild -bs ${CMAKE_SOURCE_DIR}/dist/clementine.spec
-  COMMAND ${MOCK_COMMAND}
-      --verbose
-      --root=${MOCK_CHROOT}
-      --resultdir=${CMAKE_BINARY_DIR}/mock_result/
-      ${RPMBUILD_DIR}/SRPMS/clementine-${CLEMENTINE_VERSION_RPM_V}-${CLEMENTINE_VERSION_RPM_R}.${RPM_DISTRO}.src.rpm
-  COMMAND ${CMAKE_COMMAND} -E copy
-      ${CMAKE_BINARY_DIR}/mock_result/clementine-${CLEMENTINE_VERSION_RPM_V}-${CLEMENTINE_VERSION_RPM_R}.${RPM_DISTRO}.${RPM_ARCH}.rpm
-      ${CMAKE_BINARY_DIR}/clementine-${CLEMENTINE_VERSION_RPM_V}-${CLEMENTINE_VERSION_RPM_R}.${RPM_DISTRO}.${RPM_ARCH}.rpm
-)

dist/clementine.spec.in

@@ -1,6 +1,6 @@
 Name:           clementine
 Version:        @CLEMENTINE_VERSION_RPM_V@
-Release:        @CLEMENTINE_VERSION_RPM_R@.@RPM_DISTRO@
+Release:        @CLEMENTINE_VERSION_RPM_R@%{?dist}
 Summary:        A music player and library organiser
 
 Group:          Applications/Multimedia