[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2053-g73afba6

[Eric Noulard]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  73afba6b813dee2dce1d5b15c6a8eea4d7da4f00 (commit)
       via  9be3da1c80cacfe804bddce1af2698e81d3164aa (commit)
      from  e472abf88fa03d1d08c91ef4ba0cb489c9859a13 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=73afba6b813dee2dce1d5b15c6a8eea4d7da4f00
commit 73afba6b813dee2dce1d5b15c6a8eea4d7da4f00
Merge: e472abf 9be3da1
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Sat Feb 9 07:44:13 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 9 07:44:13 2013 -0500

    Merge topic 'CPackRPM-fixSomeRPMSpecificVarHandling' into next
    
    9be3da1 CPackRPM fix #13898 uses IF(DEFINED var) to avoid wrong var value logic


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9be3da1c80cacfe804bddce1af2698e81d3164aa
commit 9be3da1c80cacfe804bddce1af2698e81d3164aa
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Sat Feb 9 13:42:05 2013 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Sat Feb 9 13:42:05 2013 +0100

    CPackRPM fix #13898 uses IF(DEFINED var) to avoid wrong var value logic

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 34d0045..fa79e1b 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -451,31 +451,41 @@ endif()
 
 # Check if additional fields for RPM spec header are given
 # There may be some COMPONENT specific variables as well
+# If component specific var is not provided we use the global one
+# for each component
 foreach(_RPM_SPEC_HEADER URL REQUIRES SUGGESTS PROVIDES OBSOLETES PREFIX CONFLICTS AUTOPROV AUTOREQ AUTOREQPROV)
     if(CPACK_RPM_PACKAGE_DEBUG)
       message("CPackRPM:Debug: processing ${_RPM_SPEC_HEADER}")
     endif()
     if(CPACK_RPM_PACKAGE_COMPONENT)
-        if(CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_${_RPM_SPEC_HEADER})
+        if(DEFINED CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_${_RPM_SPEC_HEADER})
             if(CPACK_RPM_PACKAGE_DEBUG)
               message("CPackRPM:Debug: using CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_${_RPM_SPEC_HEADER}")
             endif()
             set(CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP ${CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_${_RPM_SPEC_HEADER}})
         else()
-            if(CPACK_RPM_PACKAGE_DEBUG)
-              message("CPackRPM:Debug: CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_${_RPM_SPEC_HEADER} not defined")
-              message("CPackRPM:Debug: using CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}")
+            if(DEFINED CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER})
+              if(CPACK_RPM_PACKAGE_DEBUG)
+                message("CPackRPM:Debug: CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_${_RPM_SPEC_HEADER} not defined")
+                message("CPackRPM:Debug: using CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}")
+              endif()
+              set(CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP ${CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}})
             endif()
-            set(CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP ${CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}})
         endif()
     else()
-        if(CPACK_RPM_PACKAGE_DEBUG)
-          message("CPackRPM:Debug: using CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}")
+        if(DEFINED CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER})
+          if(CPACK_RPM_PACKAGE_DEBUG)
+            message("CPackRPM:Debug: using CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}")
+          endif()
+          set(CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP ${CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}})
         endif()
-        set(CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP ${CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}})
     endif()
 
-  if(CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP)
+  # Treat the RPM Spec keyword iff it has been properly defined
+  if(DEFINED CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP)
+    # Transform NAME --> Name e.g. PROVIDES --> Provides
+    # The Upper-case first letter and lowercase tail is the
+    # appropriate value required in the final RPM spec file.
     string(LENGTH ${_RPM_SPEC_HEADER} _PACKAGE_HEADER_STRLENGTH)
     math(EXPR _PACKAGE_HEADER_STRLENGTH "${_PACKAGE_HEADER_STRLENGTH} - 1")
     string(SUBSTRING ${_RPM_SPEC_HEADER} 1 ${_PACKAGE_HEADER_STRLENGTH} _PACKAGE_HEADER_TAIL)

-----------------------------------------------------------------------

Summary of changes:
 Modules/CPackRPM.cmake |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake