[vlmc-devel] commit: CMakeLists.txt: The tilde (~) in git version ptach leads the RPM build (Rohit Yadav )

[git at videolan.org]

vlmc | branch: master | Rohit Yadav <rohityadav89 at gmail.com> | Mon Oct  4 19:55:26 2010 +0530| [731b2fd5801bc6ba0498b36dee6288224c601d73] | committer: Rohit Yadav 

CMakeLists.txt: The tilde (~) in git version ptach leads the RPM build
to error, so remove that. Set ${PROJECT_DESCRIPTION} as cpack description
for RPM as the newline \n causes nuisance.

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=731b2fd5801bc6ba0498b36dee6288224c601d73
---

 CMakeLists.txt |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4b5a62b..6ddbba1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,7 @@ ELSE("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
             COMMAND ${GIT} rev-parse --short HEAD 
             OUTPUT_VARIABLE GIT_OUT OUTPUT_STRIP_TRAILING_WHITESPACE
         )
-        SET(PATCH_OUT "0~git-${GIT_OUT}")
+        SET(PATCH_OUT "0_git${GIT_OUT}")
     ELSE(GIT)
         SET(PATCH_OUT "0")
     ENDIF(GIT)
@@ -274,7 +274,7 @@ INCLUDE ( ${CMAKE_MODULE_PATH}/RpmBuild.cmake )
 IF ( RPMBUILD_FOUND AND NOT WIN32 )
     SET(CPACK_GENERATOR "RPM")
     SET(CPACK_SET_DESTDIR TRUE)
-    SET(CPACK_RPM_PACKAGE_REQUIRES ${PACKAGE_REQUIRES})
+    SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_DESCRIPTION}")
 ENDIF ( RPMBUILD_FOUND AND NOT WIN32 )
 
 # Debian packages