[GeographicLib/el6: 2/2] Merge branch 'epel7' into el6

[rmattes]

commit 405139e697949b61c9607bb4e359656a5f4f72c0
Merge: 3e04e96 d732da1
Author: Rich Mattes <richmattes at gmail.com>
Date:   Sun Jan 4 10:08:27 2015 -0500

    Merge branch 'epel7' into el6

 GeographicLib-1.40-cmakeversion.patch |   12 ++++++++++++
 GeographicLib.spec                    |    4 ++++
 2 files changed, 16 insertions(+), 0 deletions(-)
---
diff --cc GeographicLib.spec
index f24c90f,bd0df32..bc0eb08
--- a/GeographicLib.spec
+++ b/GeographicLib.spec
@@@ -16,8 -16,11 +16,11 @@@ Patch1:         %{name}-1.40-rpath.patc
  # Install cmake files to datadir/prooject/cmake
  # Not submitted upstream
  Patch2:         %{name}-1.38-cmakeinstall.patch
+ # Fix compatibility logic for interface include dir
+ # Not submitted upstream
+ Patch3:         %{name}-1.40-cmakeversion.patch
  
 -BuildRequires:  cmake
 +BuildRequires:  cmake28
  BuildRequires:  doxygen
  BuildRequires:  python2-devel