[cmake-commits] hoffman committed CPackRPM.cmake 1.5 1.6

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv5102

Modified Files:
	CPackRPM.cmake 
Log Message:
ENH: fix for RPM generator from Eric


Index: CPackRPM.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPackRPM.cmake,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CPackRPM.cmake	30 Oct 2007 14:16:43 -0000	1.5
+++ CPackRPM.cmake	1 Nov 2007 13:52:09 -0000	1.6
@@ -110,7 +110,19 @@
 # a source RPM
 
 # CPACK_RPM_PACKAGE_DESCRIPTION
-# FIXME may be found in CPACK_PACKAGE_DESCRIPTION_FILE
+# The variable content may be either
+#   - explicitely given by tthe user or
+#   - filled with the content of CPACK_PACKAGE_DESCRIPTION_FILE
+#     if it is defined
+#   - set to a default value
+#
+IF (NOT CPACK_RPM_PACKAGE_DESCRIPTION)
+        IF (CPACK_PACKAGE_DESCRIPTION_FILE)
+                FILE(READ ${CPACK_PACKAGE_DESCRIPTION_FILE} CPACK_RPM_PACKAGE_DESCRIPTION)
+        ELSE (CPACK_PACKAGE_DESCRIPTION_FILE)
+                SET(CPACK_RPM_PACKAGE_DESCRIPTION "no package description available")
+        ENDIF (CPACK_PACKAGE_DESCRIPTION_FILE)
+ENDIF (NOT CPACK_RPM_PACKAGE_DESCRIPTION)
 
 # CPACK_RPM_USER_BINARY_SPECFILE 
 # FIXME when this is set then CPack should us the 
@@ -173,19 +185,17 @@
 %define _topdir ${CPACK_RPM_DIRECTORY}
 
 %description
-${CPACK_RPM_PACKAGE_NAME} : will come soon 
-with the value of CPACK_RPM_PACKAGE_DESCRIPTION
-or
-the content of CPACK_PACKAGE_DESCRIPTION_FILE
-***
 ${CPACK_RPM_PACKAGE_DESCRIPTION}
-***
 
-%prep
+# This is a shortcutted spec file
+# generated by CMake RPM generator
+# we skip the %prepn %build and %install
+# steps because CPack does that for us
+#%prep
 
-%build
+#%build
   
-%install
+#%install
 
 %clean