[Cmake-commits] CMake branch, next, updated. v3.1.2-1155-g4267f43

[Brad King]

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  4267f43d15cd42040773c620781ab8f7926f343b (commit)
       via  3d99355b11b2509f4e16ddfd71373538410364e7 (commit)
      from  2681102e08a5a1f3615ee0c7717e7569ee460e25 (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=4267f43d15cd42040773c620781ab8f7926f343b
commit 4267f43d15cd42040773c620781ab8f7926f343b
Merge: 2681102 3d99355
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 09:42:18 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 09:42:18 2015 -0500

    Merge topic 'cpack_rpm_mulit_prefix_fixup' into next
    
    3d99355b CPackRPM: Fix recognition of absolute relocation paths


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d99355b11b2509f4e16ddfd71373538410364e7
commit 3d99355b11b2509f4e16ddfd71373538410364e7
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sun Feb 8 20:03:53 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 10 09:41:37 2015 -0500

    CPackRPM: Fix recognition of absolute relocation paths
    
    Fix typo in logic added by commit 3ec02547 (CPackRPM: Allow multiple
    path relocation prefixes for one package, 2015-01-21).

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 43e3fe0..214d655 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -442,7 +442,7 @@ function(cpack_rpm_prepare_relocation_paths)
 
   # set other path prefixes
   foreach(RELOCATION_PATH ${RPM_RELOCATION_PATHS})
-    if(IS_ABSOLUTE "${RELOCATE_PATH}")
+    if(IS_ABSOLUTE "${RELOCATION_PATH}")
       set(PREPARED_RELOCATION_PATH "${RELOCATION_PATH}")
     else()
       set(PREPARED_RELOCATION_PATH "${PATH_PREFIX}/${RELOCATION_PATH}")

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

Summary of changes:


hooks/post-receive
-- 
CMake