summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2010-07-06 14:28:32 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2010-07-06 14:28:32 (GMT)
commit9fbf64445d4e7831c10de533fffcd8aca7bb96be (patch)
tree19500aa591cca3eb8442edc2cb11aadf60e93a86
parent28a16d1cc45c23caeb185d20f0a0a83d51c3bbeb (diff)
parent7486396e5b4272546f085f0721294bb01e083202 (diff)
downloadCMake-9fbf64445d4e7831c10de533fffcd8aca7bb96be.zip
CMake-9fbf64445d4e7831c10de533fffcd8aca7bb96be.tar.gz
CMake-9fbf64445d4e7831c10de533fffcd8aca7bb96be.tar.bz2
Merge branch 'CPackRPM-fixDashInRPMVersion'
-rw-r--r--Modules/CPackRPM.cmake5
1 files changed, 5 insertions, 0 deletions
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 3bf8e0e..e9fe66c 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -213,6 +213,11 @@ IF(NOT CPACK_RPM_PACKAGE_VERSION)
ENDIF(NOT CPACK_PACKAGE_VERSION)
SET(CPACK_RPM_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION})
ENDIF(NOT CPACK_RPM_PACKAGE_VERSION)
+# Replace '-' in version with '_'
+# '-' character is an Illegal RPM version character
+# it is illegal because it is used to separate
+# RPM "Version" from RPM "Release"
+STRING(REPLACE "-" "_" CPACK_RPM_PACKAGE_VERSION ${CPACK_RPM_PACKAGE_VERSION})
# CPACK_RPM_PACKAGE_ARCHITECTURE (optional)
IF(CPACK_RPM_PACKAGE_ARCHITECTURE)